mkws-moved-to-github.git
10 years agoComment
Mike Taylor [Wed, 9 Apr 2014 12:28:27 +0000 (13:28 +0100)]
Comment

10 years agoFirst bits of the developer guide.
Mike Taylor [Wed, 9 Apr 2014 12:23:12 +0000 (13:23 +0100)]
First bits of the developer guide.

10 years agoAdd the "Done" widget.
Mike Taylor [Tue, 8 Apr 2014 16:09:33 +0000 (17:09 +0100)]
Add the "Done" widget.
Shows how applications can handle bugs MKWS-48 and MKWS-49.

10 years agoonStat publishes a "complete" event when the number of active clients
Mike Taylor [Tue, 8 Apr 2014 16:08:57 +0000 (17:08 +0100)]
onStat publishes a "complete" event when the number of active clients
falls to zero. This enables us to make a "search is complete" widget,
which fixes bugs MKWS-48 and MKWS-49.

10 years agoAdd mkwsDone widget.
Mike Taylor [Tue, 8 Apr 2014 16:07:02 +0000 (17:07 +0100)]
Add mkwsDone widget.
Use Wolfram's smaller, better, faster library.

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 15:47:56 +0000 (15:47 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoFix facet style on .mkwsFacet rather than their container .mkwsTermlists
Mike Taylor [Tue, 8 Apr 2014 15:45:32 +0000 (16:45 +0100)]
Fix facet style on .mkwsFacet rather than their container .mkwsTermlists

10 years agouse fork/exec() instead system, MKWS-157
Wolfram Schneider [Tue, 8 Apr 2014 15:40:45 +0000 (15:40 +0000)]
use fork/exec() instead system, MKWS-157

simplify alarm() handling

10 years agoNew layout with one facet separated from the others.
Mike Taylor [Tue, 8 Apr 2014 15:39:22 +0000 (16:39 +0100)]
New layout with one facet separated from the others.

10 years agogerman lang
Wolfram Schneider [Tue, 8 Apr 2014 12:04:51 +0000 (12:04 +0000)]
german lang

10 years agouse single component mkws-*.js files (was mkws.js)
Wolfram Schneider [Tue, 8 Apr 2014 12:01:52 +0000 (12:01 +0000)]
use single component mkws-*.js files (was mkws.js)

test with german lang, and with standard test account

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 11:56:53 +0000 (11:56 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoUse Douglas Crockford's mkws.objectInheritingFrom rather than the
Mike Taylor [Tue, 8 Apr 2014 11:48:12 +0000 (12:48 +0100)]
Use Douglas Crockford's mkws.objectInheritingFrom rather than the
built-in Object.create, which is not available in IE8.

10 years agoUse Douglas Crockford's mkws.objectInheritingFrom rather than the
Mike Taylor [Tue, 8 Apr 2014 11:48:02 +0000 (12:48 +0100)]
Use Douglas Crockford's mkws.objectInheritingFrom rather than the
built-in Object.create, which is not available in IE8.

10 years agoAdd mkws.objectInheritingFrom function, code is from Douglas
Mike Taylor [Tue, 8 Apr 2014 11:47:16 +0000 (12:47 +0100)]
Add mkws.objectInheritingFrom function, code is from Douglas
Crockford's article "Prototypal Inheritance in JavaScript":
http://javascript.crockford.com/prototypal.html
mkws.objectInheritingFrom behaves the same as Object.create, but since
the latter is not available in IE8 we can't use it.

Fixes bug MKWS-77 *again*.

10 years agosleep a little bit between sending signals to childs
Wolfram Schneider [Tue, 8 Apr 2014 11:34:26 +0000 (11:34 +0000)]
sleep a little bit between sending signals to childs

10 years agosince we have ./logs/.gitignore, we don't need a ./logs/.gitkeep file anymore
Wolfram Schneider [Tue, 8 Apr 2014 11:15:55 +0000 (11:15 +0000)]
since we have ./logs/.gitignore, we don't need a ./logs/.gitkeep file anymore

10 years agorun with 'phantomjs' tests
Wolfram Schneider [Tue, 8 Apr 2014 11:13:49 +0000 (11:13 +0000)]
run with 'phantomjs' tests

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 11:10:21 +0000 (11:10 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoget rid of the "apache2: Could not reliably determine the server's fully qualified...
Wolfram Schneider [Tue, 8 Apr 2014 11:10:02 +0000 (11:10 +0000)]
get rid of the "apache2: Could not reliably determine the server's fully qualified domain name, using 10.0.0.5 for ServerName" warning

10 years agoReinstate Alias /tools/htdocs/
Mike Taylor [Tue, 8 Apr 2014 11:06:57 +0000 (12:06 +0100)]
Reinstate Alias /tools/htdocs/
Point Alias /src/ to the src directory.

10 years agoMerge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 8 Apr 2014 11:05:34 +0000 (12:05 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

10 years agoGet mkws.css from /tools/htdocs/ after all, as /src/ is the source directory.
Mike Taylor [Tue, 8 Apr 2014 11:05:19 +0000 (12:05 +0100)]
Get mkws.css from /tools/htdocs/ after all, as /src/ is the source directory.

10 years agouse single component mkws-*.js files (was mkws.js)
Wolfram Schneider [Tue, 8 Apr 2014 11:00:36 +0000 (11:00 +0000)]
use single component mkws-*.js files (was mkws.js)

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 10:56:12 +0000 (10:56 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoMerge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 8 Apr 2014 10:55:38 +0000 (11:55 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

10 years agoGet mkws.css from /src/ rather than /tools/htdocs/.
Mike Taylor [Tue, 8 Apr 2014 10:55:05 +0000 (11:55 +0100)]
Get mkws.css from /src/ rather than /tools/htdocs/.
(Both were aliases to the same directory anyway.)

10 years agoinclude apache config files directly from /etc/apache2/mods-available
Wolfram Schneider [Tue, 8 Apr 2014 10:54:51 +0000 (10:54 +0000)]
include apache config files directly from /etc/apache2/mods-available

this is more robust for testing than using /etc/apache2/mods-enabled/
which may requires to run first: sudo a2enmod headers

10 years agoAlias /tools/htdocs/ replaced with Alias /src/
Mike Taylor [Tue, 8 Apr 2014 10:54:35 +0000 (11:54 +0100)]
Alias /tools/htdocs/ replaced with Alias /src/
I think this reflects changes in jasmine-popup.html

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 10:53:13 +0000 (10:53 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoNot needed now we have a .gitignore
Mike Taylor [Tue, 8 Apr 2014 10:51:35 +0000 (11:51 +0100)]
Not needed now we have a .gitignore

10 years agoNew
Mike Taylor [Tue, 8 Apr 2014 10:51:22 +0000 (11:51 +0100)]
New

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:46:44 +0000 (10:46 +0000)]
add new aliases /src /jasmine /test

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:44:35 +0000 (10:44 +0000)]
add new aliases /src /jasmine /test

10 years agoMerge remote branch 'origin/wosch'
Wolfram Schneider [Tue, 8 Apr 2014 10:36:29 +0000 (10:36 +0000)]
Merge remote branch 'origin/wosch'

Conflicts:
test/spec/mkws-pazpar2.js

10 years agoNew **make-default** rule: ../tools/htdocs/mkws.js
Mike Taylor [Tue, 8 Apr 2014 10:19:30 +0000 (11:19 +0100)]
New **make-default** rule: ../tools/htdocs/mkws.js

10 years agoMove saved_config code inside $(document).ready(function() {} block.
Mike Taylor [Tue, 8 Apr 2014 10:19:06 +0000 (11:19 +0100)]
Move saved_config code inside $(document).ready(function() {} block.
It DOES work there -- I don't know why I thought before it didn't.
(I was probably confused by the difficulty of dealing with a variable
that may or may not have been defined.)
Fixes bug MKWS-149.

10 years agoRevert jasmine-config.html to 4ded4703dd42e64d3e4bd253c1298c35dbb9da7f
Mike Taylor [Tue, 8 Apr 2014 10:15:57 +0000 (11:15 +0100)]
Revert jasmine-config.html to 4ded4703dd42e64d3e4bd253c1298c35dbb9da7f

10 years agoMove mkws_config setting up above inclusion of MKWS.
Mike Taylor [Tue, 8 Apr 2014 09:35:15 +0000 (10:35 +0100)]
Move mkws_config setting up above inclusion of MKWS.
Patches around MKWS-149 ("setting pazpar2_url no longer works")
But we want to reinstate the old behaviour, so this is not a fix.

10 years agomore facet sources fixes
Wolfram Schneider [Mon, 7 Apr 2014 18:43:36 +0000 (18:43 +0000)]
more facet sources fixes

10 years agofix totally broken facets
Wolfram Schneider [Mon, 7 Apr 2014 18:37:42 +0000 (18:37 +0000)]
fix totally broken facets

10 years agotest with /jasmine-local-popup.html by default
Wolfram Schneider [Mon, 7 Apr 2014 18:16:17 +0000 (18:16 +0000)]
test with /jasmine-local-popup.html by default

This should make it easier to detect if the MKWS / mkadmin setup is broken

10 years agocheck the exact number of active connections
Wolfram Schneider [Mon, 7 Apr 2014 18:14:41 +0000 (18:14 +0000)]
check the exact number of active connections

This should make it easier to detect if the MKWS / mkadmin setup is broken

10 years agoif the source click fails, skip all tests which test for a single active connection
Wolfram Schneider [Mon, 7 Apr 2014 18:03:27 +0000 (18:03 +0000)]
if the source click fails, skip all tests which test for a single active connection

10 years agoFix jQuery selectors for new, cleaner representation of facets.
Mike Taylor [Mon, 7 Apr 2014 16:27:18 +0000 (17:27 +0100)]
Fix jQuery selectors for new, cleaner representation of facets.
I may not have caught them all -- test doesn't run cleanly.

10 years agoMerge branch 'wosch' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch
Wolfram Schneider [Mon, 7 Apr 2014 16:15:46 +0000 (16:15 +0000)]
Merge branch 'wosch' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Mon, 7 Apr 2014 16:12:11 +0000 (16:12 +0000)]
add new aliases /src /jasmine /test

10 years agoMerge remote branch 'origin/master' into wosch
Wolfram Schneider [Mon, 7 Apr 2014 16:04:18 +0000 (16:04 +0000)]
Merge remote branch 'origin/master' into wosch

10 years agoMake facetConfig local to the Facet widget.
Mike Taylor [Mon, 7 Apr 2014 15:59:48 +0000 (16:59 +0100)]
Make facetConfig local to the Facet widget.

10 years agoMove mkws.facetConfig down inside the Facet widget, the only one that uses it.
Mike Taylor [Mon, 7 Apr 2014 15:59:05 +0000 (16:59 +0100)]
Move mkws.facetConfig down inside the Facet widget, the only one that uses it.

10 years agoRemove unnecessary check on facetConfig for Termlists widget.
Mike Taylor [Mon, 7 Apr 2014 15:58:33 +0000 (16:58 +0100)]
Remove unnecessary check on facetConfig for Termlists widget.

10 years agoMove mkws.facetConfig into mkws-widget-termlists.js, the only place that needs it.
Mike Taylor [Mon, 7 Apr 2014 15:58:03 +0000 (16:58 +0100)]
Move mkws.facetConfig into mkws-widget-termlists.js, the only place that needs it.

10 years agoRemove facetConfig, which is no longer needed here.
Mike Taylor [Mon, 7 Apr 2014 15:56:14 +0000 (16:56 +0100)]
Remove facetConfig, which is no longer needed here.

10 years agoSimplify generation of facet scaffolding.
Mike Taylor [Mon, 7 Apr 2014 15:55:59 +0000 (16:55 +0100)]
Simplify generation of facet scaffolding.
No longer needs the use of mkws.facetConfig.

10 years agoRemove no-longer-needed kludgy mkwsFacetNAME elements from CSS classes.
Mike Taylor [Mon, 7 Apr 2014 15:53:00 +0000 (16:53 +0100)]
Remove no-longer-needed kludgy mkwsFacetNAME elements from CSS classes.

10 years agoEach facet is now (finally!) its own widget.
Mike Taylor [Mon, 7 Apr 2014 15:52:06 +0000 (16:52 +0100)]
Each facet is now (finally!) its own widget.

10 years agodata-mkws-facet is now set of the index's name, not its caption.
Mike Taylor [Mon, 7 Apr 2014 15:51:30 +0000 (16:51 +0100)]
data-mkws-facet is now set of the index's name, not its caption.

10 years agomove ./bomb.pl script to ./bin sub-directory
Wolfram Schneider [Mon, 7 Apr 2014 15:48:24 +0000 (15:48 +0000)]
move ./bomb.pl script to ./bin sub-directory

10 years agosave
Wolfram Schneider [Mon, 7 Apr 2014 15:48:05 +0000 (15:48 +0000)]
save

10 years ago./tmp is gone
Wolfram Schneider [Mon, 7 Apr 2014 15:41:15 +0000 (15:41 +0000)]
./tmp is gone

10 years agoadd ./logs directory to git
Wolfram Schneider [Mon, 7 Apr 2014 15:40:42 +0000 (15:40 +0000)]
add ./logs directory to git

10 years agonew variable APACHE_HTTPD
Wolfram Schneider [Mon, 7 Apr 2014 15:35:11 +0000 (15:35 +0000)]
new variable APACHE_HTTPD

10 years agocleanup generated apache
Wolfram Schneider [Mon, 7 Apr 2014 15:31:16 +0000 (15:31 +0000)]
cleanup generated apache

10 years agoAdd as-yet-unused data-mkws-facet attribute to mkwsFacet elements.
Mike Taylor [Mon, 7 Apr 2014 15:26:07 +0000 (16:26 +0100)]
Add as-yet-unused data-mkws-facet attribute to mkwsFacet elements.

10 years agouse Alias instead symlinks
Wolfram Schneider [Mon, 7 Apr 2014 15:23:23 +0000 (15:23 +0000)]
use Alias instead symlinks

10 years agojasmine-links is no longer needed
Wolfram Schneider [Mon, 7 Apr 2014 15:23:07 +0000 (15:23 +0000)]
jasmine-links is no longer needed

10 years agosome *.js files moved from tools/htdocs to ./src
Wolfram Schneider [Mon, 7 Apr 2014 15:21:17 +0000 (15:21 +0000)]
some *.js files moved from tools/htdocs to ./src

10 years agosome *.js files moved from tools/htdocs to ./src
Wolfram Schneider [Mon, 7 Apr 2014 15:19:23 +0000 (15:19 +0000)]
some *.js files moved from tools/htdocs to ./src

10 years agosilent apache-stop
Wolfram Schneider [Mon, 7 Apr 2014 15:07:02 +0000 (15:07 +0000)]
silent apache-stop

10 years agoautomatic start/stop for apache during phantomjs tests
Wolfram Schneider [Mon, 7 Apr 2014 15:05:40 +0000 (15:05 +0000)]
automatic start/stop for apache during phantomjs tests

10 years agocleanup tmp dir
Wolfram Schneider [Mon, 7 Apr 2014 14:52:41 +0000 (14:52 +0000)]
cleanup tmp dir

10 years agogenerate apache config file for jasmine
Wolfram Schneider [Mon, 7 Apr 2014 14:52:23 +0000 (14:52 +0000)]
generate apache config file for jasmine

10 years agoadd modules and missing config options
Wolfram Schneider [Mon, 7 Apr 2014 14:51:51 +0000 (14:51 +0000)]
add modules and missing config options

10 years agoReverse order of mkwsFacetXXX and mkwsFacet classes.
Mike Taylor [Mon, 7 Apr 2014 14:15:14 +0000 (15:15 +0100)]
Reverse order of mkwsFacetXXX and mkwsFacet classes.

10 years agochange template language to standard apache
Wolfram Schneider [Mon, 7 Apr 2014 14:14:34 +0000 (14:14 +0000)]
change template language to standard apache

10 years agoadd a temp dir
Wolfram Schneider [Mon, 7 Apr 2014 14:00:19 +0000 (14:00 +0000)]
add a temp dir

10 years agoconvert to a real template
Wolfram Schneider [Mon, 7 Apr 2014 13:55:20 +0000 (13:55 +0000)]
convert to a real template

10 years agocopy of mkws-dev, MKWS-148
Wolfram Schneider [Mon, 7 Apr 2014 13:52:17 +0000 (13:52 +0000)]
copy of mkws-dev, MKWS-148

10 years agoSeparate pub/sub event for each facet.
Mike Taylor [Mon, 7 Apr 2014 13:23:20 +0000 (14:23 +0100)]
Separate pub/sub event for each facet.
Took *a lot* of poxing about to fix the closure-variable error.

10 years agoSeparate out callback for displaying termlists area and filling individual lists.
Mike Taylor [Mon, 7 Apr 2014 11:01:32 +0000 (12:01 +0100)]
Separate out callback for displaying termlists area and filling individual lists.

10 years agoRemove code to create termlist scaffolding: now in mkws-team.js
Mike Taylor [Mon, 7 Apr 2014 10:55:09 +0000 (11:55 +0100)]
Remove code to create termlist scaffolding: now in mkws-team.js

10 years agoScaffolding for facets is put in place before widgets are created.
Mike Taylor [Mon, 7 Apr 2014 10:52:50 +0000 (11:52 +0100)]
Scaffolding for facets is put in place before widgets are created.

10 years agoMake findnode() visible as a team method.
Mike Taylor [Fri, 4 Apr 2014 16:15:30 +0000 (17:15 +0100)]
Make findnode() visible as a team method.

10 years agoPut facetConfig into the mkws object.
Mike Taylor [Fri, 4 Apr 2014 16:07:33 +0000 (17:07 +0100)]
Put facetConfig into the mkws object.

10 years agoScaffolding is now generated immediately, not when data arrives.
Mike Taylor [Fri, 4 Apr 2014 16:00:50 +0000 (17:00 +0100)]
Scaffolding is now generated immediately, not when data arrives.

10 years agoStyles refer to .mkwsFacet rather than div.facet within .mkwsTermlists
Mike Taylor [Fri, 4 Apr 2014 15:51:29 +0000 (16:51 +0100)]
Styles refer to .mkwsFacet rather than div.facet within .mkwsTermlists

10 years agoRemove unnecessary check.
Mike Taylor [Fri, 4 Apr 2014 15:49:44 +0000 (16:49 +0100)]
Remove unnecessary check.

10 years agoRename variable.
Mike Taylor [Fri, 4 Apr 2014 15:40:11 +0000 (16:40 +0100)]
Rename variable.

10 years agoRemove obsolete logging.
Mike Taylor [Fri, 4 Apr 2014 15:39:46 +0000 (16:39 +0100)]
Remove obsolete logging.

10 years agoMerge the two consecutive facet-generation loops into one.
Mike Taylor [Fri, 4 Apr 2014 15:31:48 +0000 (16:31 +0100)]
Merge the two consecutive facet-generation loops into one.
Throw away the accumulating-state hash.

10 years agoReorder code to bring scaffold-generation together.
Mike Taylor [Fri, 4 Apr 2014 15:30:04 +0000 (16:30 +0100)]
Reorder code to bring scaffold-generation together.

10 years agoEliminate the addSingleScaffold function, inlining its code.
Mike Taylor [Fri, 4 Apr 2014 15:28:24 +0000 (16:28 +0100)]
Eliminate the addSingleScaffold function, inlining its code.

10 years agoMake addSingleScaffold private to the loop that uses it.
Mike Taylor [Fri, 4 Apr 2014 15:26:32 +0000 (16:26 +0100)]
Make addSingleScaffold private to the loop that uses it.

10 years agoLoop separately for addSingleScaffold and makeSingleFacet
Mike Taylor [Fri, 4 Apr 2014 15:25:36 +0000 (16:25 +0100)]
Loop separately for addSingleScaffold and makeSingleFacet

10 years agoRemove unused arguments from addSingleScaffold and makeSingleFacet
Mike Taylor [Fri, 4 Apr 2014 15:20:29 +0000 (16:20 +0100)]
Remove unused arguments from addSingleScaffold and makeSingleFacet

10 years agoRevert author-facet title to "Authors", not "Author"
Mike Taylor [Fri, 4 Apr 2014 15:17:49 +0000 (16:17 +0100)]
Revert author-facet title to "Authors", not "Author"
Makes the Jasmine-test work again.

10 years agoBreak addSingleFacet into two functions, addSingleScaffold which adds
Mike Taylor [Fri, 4 Apr 2014 15:16:02 +0000 (16:16 +0100)]
Break addSingleFacet into two functions, addSingleScaffold which adds
scaffolding to the main HTML, and makeSingleFacet which returns the
HTML of a specific facet.

10 years agoWe now use a silly half-and-half scheme where an accumulator fills up
Mike Taylor [Fri, 4 Apr 2014 15:12:07 +0000 (16:12 +0100)]
We now use a silly half-and-half scheme where an accumulator fills up
the scaffolding HTML while we also gather separately the HTML of each
individual facet. Working towards facet separation.

10 years agoDifferences between various facets are now driven by a table rather
Mike Taylor [Fri, 4 Apr 2014 14:53:26 +0000 (15:53 +0100)]
Differences between various facets are now driven by a table rather
than hardwired switching.

10 years agoEmit "mkwsFacet" class rather than just "facet"
Mike Taylor [Fri, 4 Apr 2014 14:29:49 +0000 (15:29 +0100)]
Emit "mkwsFacet" class rather than just "facet"
Not only is this cleaner, but it means each facet can be a widget.