Mike Taylor [Fri, 13 Dec 2013 11:41:29 +0000 (11:41 +0000)]
Add commented-out rewrite-logging.
Mike Taylor [Thu, 12 Dec 2013 17:32:58 +0000 (17:32 +0000)]
Ignore generated links jasmine and test
Mike Taylor [Thu, 12 Dec 2013 17:32:36 +0000 (17:32 +0000)]
Resolve: it seems Wolfram and I both independently added an examples/htdocs/Makefile at the same time
Mike Taylor [Thu, 12 Dec 2013 17:30:10 +0000 (17:30 +0000)]
Invoke examples/htdocs/Makefile for "all" and "clean" targets.
Mike Taylor [Thu, 12 Dec 2013 17:29:08 +0000 (17:29 +0000)]
Add "all" rule
Mike Taylor [Thu, 12 Dec 2013 17:27:59 +0000 (17:27 +0000)]
Ignore generated apache-config.txt
Mike Taylor [Thu, 12 Dec 2013 17:27:43 +0000 (17:27 +0000)]
New file, examples/Makefile.
Exists only to make readable Apache2 config example.
Mike Taylor [Thu, 12 Dec 2013 17:22:53 +0000 (17:22 +0000)]
Move small mkws-tools-mike across from examples area to tools area
Mike Taylor [Thu, 12 Dec 2013 17:21:20 +0000 (17:21 +0000)]
New example file using local authentication (MKWS-38)
Mike Taylor [Thu, 12 Dec 2013 17:20:52 +0000 (17:20 +0000)]
Move aside
Mike Taylor [Thu, 12 Dec 2013 16:59:48 +0000 (16:59 +0000)]
Reorder to better match ../../tools/apache2/mkws-mike
The real question of course is why do both of these files exist?
Mike Taylor [Thu, 12 Dec 2013 16:55:44 +0000 (16:55 +0000)]
New file, initially consists of a stanza extracted from mkws-examples-mike
Mike Taylor [Thu, 12 Dec 2013 16:55:19 +0000 (16:55 +0000)]
Remove x.mkws.indexdata.com stanza into its own file, mkws-tools-mike
Mike Taylor [Thu, 12 Dec 2013 16:54:36 +0000 (16:54 +0000)]
"Customer" Apache2 configuration used RewriteRule instead of ProxyPass
to handle /service-proxy-auth/
Acts as an example of MKWS-38 ("More secure authentication for MKWS")
Mike Taylor [Thu, 12 Dec 2013 16:49:23 +0000 (16:49 +0000)]
Use ${MAKE} -C instead of explicit cd in subshell.
Wolfram Schneider [Thu, 12 Dec 2013 16:25:08 +0000 (16:25 +0000)]
Handlebars doesn't like being hot-included from its home. It wants you to download it locally.
Wolfram Schneider [Thu, 12 Dec 2013 16:04:22 +0000 (16:04 +0000)]
improve readablity: cat one file per line
Wolfram Schneider [Thu, 12 Dec 2013 15:36:59 +0000 (15:36 +0000)]
rename mkws.service_proxy_auth to mkws.authenticated
The mkws.authenticated property is used in the test framework
to check if the service proxy authentification was successfully.
This fix
7eb3ec5aa9b558216fc06205a4085d875f554a7c
Wolfram Schneider [Thu, 12 Dec 2013 15:22:29 +0000 (15:22 +0000)]
set mkws.usesessions later after the config object was checked.
This is a side effect of
d7fa203c58fd4eb63c6fc1eeeb3ffa94ef32dbb4
Wolfram Schneider [Thu, 12 Dec 2013 15:09:25 +0000 (15:09 +0000)]
one variable less
Wolfram Schneider [Thu, 12 Dec 2013 15:08:52 +0000 (15:08 +0000)]
spaces
Wolfram Schneider [Thu, 12 Dec 2013 15:00:37 +0000 (15:00 +0000)]
Revert "Eliminate superfluous temporary assignments."
This reverts commit
bba27d39caf95d9f0c4684f1f4d49ac8747ca03c.
Actually, these are not superfluous. The variables are used in
the jasmine framework to check if the config values make sense
before calling new pz2( {}) with an json object.
Wolfram Schneider [Thu, 12 Dec 2013 14:54:15 +0000 (14:54 +0000)]
add Makefile to create symlinks for jasmine
this allow us to run the test from the local file system
or from a web site
Mike Taylor [Wed, 11 Dec 2013 17:21:56 +0000 (17:21 +0000)]
Add documentation of template system.
Fixes bug MKWS-68.
Wolfram Schneider [Tue, 10 Dec 2013 14:29:54 +0000 (14:29 +0000)]
include JS framework handlebars.runtime-v1.1.2.js
Wolfram Schneider [Tue, 10 Dec 2013 14:27:31 +0000 (14:27 +0000)]
Wolfram Schneider [Tue, 10 Dec 2013 13:18:13 +0000 (13:18 +0000)]
force exit once tests complete
this should solve the problem that jasmine-node waits for a
pz2 request response and fails due an alert() error message
Wolfram Schneider [Tue, 10 Dec 2013 09:55:44 +0000 (09:55 +0000)]
log the pz2.js GIT id in the header of mkws-complete.js as well
Wolfram Schneider [Tue, 10 Dec 2013 09:46:10 +0000 (09:46 +0000)]
minor reformat
Wolfram Schneider [Tue, 10 Dec 2013 09:44:51 +0000 (09:44 +0000)]
move helper targets to the bottom
Wolfram Schneider [Tue, 10 Dec 2013 09:41:51 +0000 (09:41 +0000)]
reformat warning for better readability
Wolfram Schneider [Tue, 10 Dec 2013 09:36:55 +0000 (09:36 +0000)]
pz2 JS lib moved back to pazpar2 git repo
Mike Taylor [Mon, 9 Dec 2013 23:47:27 +0000 (23:47 +0000)]
Fix column widths
Mike Taylor [Mon, 9 Dec 2013 23:46:57 +0000 (23:46 +0000)]
Add minimal styling for table.
Mike Taylor [Mon, 9 Dec 2013 23:46:03 +0000 (23:46 +0000)]
uh ...
Mike Taylor [Mon, 9 Dec 2013 23:43:11 +0000 (23:43 +0000)]
Simplify.
Mike Taylor [Mon, 9 Dec 2013 23:41:36 +0000 (23:41 +0000)]
Add link to auto.html
Mike Taylor [Mon, 9 Dec 2013 23:40:35 +0000 (23:40 +0000)]
Update to use generated widget.
Simplify MKWS invocation.
Mike Taylor [Mon, 9 Dec 2013 22:56:28 +0000 (22:56 +0000)]
Use a widget generated by MKAdmin.
Mike Taylor [Mon, 9 Dec 2013 22:04:02 +0000 (22:04 +0000)]
Use explicit leading "pz:id="
Mike Taylor [Mon, 9 Dec 2013 22:03:46 +0000 (22:03 +0000)]
Replace #mkwsRecords with one generated by MKAdmin widget-generator.
Mike Taylor [Mon, 9 Dec 2013 22:02:29 +0000 (22:02 +0000)]
Oops, use debug() rather than log().
Mike Taylor [Mon, 9 Dec 2013 22:00:55 +0000 (22:00 +0000)]
"pz:id=" prefix only prepended to filter string if it doesn't have ANY
setting+op up front. Allows more flexibility in the use of ~ operation
and non-pz:id settings.
Mike Taylor [Mon, 9 Dec 2013 21:20:29 +0000 (21:20 +0000)]
Add /pazpar2/ alias.
Add x.example.indexdata.com stanza.
Mike Taylor [Mon, 9 Dec 2013 21:20:08 +0000 (21:20 +0000)]
Add /pazpar2/ alias.
Mike Taylor [Mon, 9 Dec 2013 21:19:29 +0000 (21:19 +0000)]
Add new alias for /pazpar2/
Mike Taylor [Mon, 9 Dec 2013 19:53:01 +0000 (19:53 +0000)]
Change all references to libjs-pz2/pz2api.1.js to pazpar2/js/pz2.js
Mike Taylor [Mon, 9 Dec 2013 19:52:47 +0000 (19:52 +0000)]
Add alias for /pazpar2/
Mike Taylor [Mon, 9 Dec 2013 12:22:26 +0000 (12:22 +0000)]
Refer throughout to pz2.js rather than libpz2.js, since the latter has
been killed (shortly after being given birth).
Mike Taylor [Mon, 9 Dec 2013 10:52:00 +0000 (10:52 +0000)]
Remove optional "pz:id=" from start of target string.
Mike Taylor [Mon, 9 Dec 2013 10:48:56 +0000 (10:48 +0000)]
Remove now-unnecessary <div id="mkwsTermlists"/>
Mike Taylor [Mon, 9 Dec 2013 10:48:31 +0000 (10:48 +0000)]
Correct syntax for targets.
Thanks to Jakub!
Mike Taylor [Fri, 6 Dec 2013 18:11:37 +0000 (18:11 +0000)]
Specify TWO targets in auto-search (MIT OpenCourseWare and PLOS)
Mike Taylor [Fri, 6 Dec 2013 18:07:38 +0000 (18:07 +0000)]
Leading "pz:id=" is optional in triggerSearch()
This means clever applications can pass in a complete filter string.
Mike Taylor [Fri, 6 Dec 2013 18:00:40 +0000 (18:00 +0000)]
Support specification of (a single) target in auto-searches.
We still need to generalise this to searching multiple targets.
Mike Taylor [Fri, 6 Dec 2013 17:58:38 +0000 (17:58 +0000)]
Omit leading "pz:id=" from target name.
Mike Taylor [Fri, 6 Dec 2013 17:56:44 +0000 (17:56 +0000)]
Clearer logging for run_auto_searches()
Mike Taylor [Fri, 6 Dec 2013 17:53:48 +0000 (17:53 +0000)]
Specify a single target for autosearch.
Mike Taylor [Fri, 6 Dec 2013 17:23:33 +0000 (17:23 +0000)]
Support sorting in autosearches.
Fixes bug MKWS-73
Mike Taylor [Fri, 6 Dec 2013 17:23:11 +0000 (17:23 +0000)]
Very slight styling of table.
Mike Taylor [Fri, 6 Dec 2013 17:21:01 +0000 (17:21 +0000)]
Specify sorting as title:1
Mike Taylor [Fri, 6 Dec 2013 17:00:03 +0000 (17:00 +0000)]
New, only for Mike's use.
Mike Taylor [Fri, 6 Dec 2013 15:30:00 +0000 (15:30 +0000)]
Rationalise the confusion between mkws_config.sort_default and mkws.sort.
Mike Taylor [Fri, 6 Dec 2013 14:52:53 +0000 (14:52 +0000)]
Move curSort global into mkws.sort
Mike Taylor [Thu, 5 Dec 2013 14:24:05 +0000 (14:24 +0000)]
New demo, auto.html, identical to current mike.html but gets
components from the public site instead of Mike's dev site.
Mike Taylor [Thu, 5 Dec 2013 13:43:59 +0000 (13:43 +0000)]
Interpret
autosearch="TERM"
rather than the more verbose
autosearch="true" query="TERM"
Mike Taylor [Thu, 5 Dec 2013 13:43:49 +0000 (13:43 +0000)]
Specify
autosearch="TERM"
rather than the more verbose
autosearch="true" query="TERM"
Mike Taylor [Thu, 5 Dec 2013 11:48:02 +0000 (11:48 +0000)]
Move invocation of run_auto_searches() from when DOM is ready to when
service-proxy authentication has completed. As a result, that search
now includes the relevant JSESSIONID, and consequently works consistently
and deliberately rather than intermittently and accidentally.
Fixes bug MKWS-69 ("Allow results area to auto-populate itself with
results of a canned search")
Remove extreme debugging output for my_onshow()
Mike Taylor [Thu, 5 Dec 2013 11:43:35 +0000 (11:43 +0000)]
Rename unused mkws property "service_proxy_auth" to "authenticated".
(Better describes what it does, and avoids confusion with the
mkws_config property of the same name.)
Check before running a search whether we're authenticated.
(It's because we were not that auto-searches were failing on
the first call of a new session -- the search was being sent
before the authentication response was received.)
Mike Taylor [Wed, 4 Dec 2013 15:54:02 +0000 (15:54 +0000)]
More detailed debugging output.
Mike Taylor [Wed, 4 Dec 2013 13:08:26 +0000 (13:08 +0000)]
Add some structure to demo page.
Mike Taylor [Wed, 4 Dec 2013 12:43:55 +0000 (12:43 +0000)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Wed, 4 Dec 2013 12:42:49 +0000 (12:42 +0000)]
Should now correctly support auto-executing#'mkwsRecords.
Doesn't work correctly, though: clears all records on second my_onshow.
Wolfram Schneider [Wed, 4 Dec 2013 09:38:05 +0000 (09:38 +0000)]
disable HTML DOM checks on examples/htdocs/mike.html
to much changed, see
f777e9d3347abb4a6ee8eebc5372df220ac6ffb2
Mike Taylor [Tue, 3 Dec 2013 14:51:52 +0000 (14:51 +0000)]
Completely changed mike.html. Doesn't work correctly for reasons I
don't yet properly understand: something the current MKWS JS is doing
seems to be breaking the CORS stuff. My attempts to figure that out
are being thwarted by my git checkout having got into a weird state
where it's ... ah, I can't even explain it. Anyway. I'm hoping that
checking in this intermediate state will at least placate git to the
point where I can go back to working on the actual problem. Sheesh.
Mike Taylor [Mon, 2 Dec 2013 16:21:10 +0000 (16:21 +0000)]
When a new search is submitted, reset and redraw the filters.
Fixes MKWS-72 ("Facet selection persist across searches")
Mike Taylor [Mon, 2 Dec 2013 16:15:45 +0000 (16:15 +0000)]
Log the actual query when a search is submitted.
Mike Taylor [Fri, 29 Nov 2013 18:56:21 +0000 (18:56 +0000)]
Test resolved.
Mike Taylor [Fri, 29 Nov 2013 18:55:36 +0000 (18:55 +0000)]
Include Handlebars in wkws-complete.js
Mike Taylor [Fri, 29 Nov 2013 18:53:12 +0000 (18:53 +0000)]
Testing ...
Mike Taylor [Fri, 29 Nov 2013 18:52:27 +0000 (18:52 +0000)]
Typo.
Mike Taylor [Fri, 29 Nov 2013 18:51:36 +0000 (18:51 +0000)]
Add link to templates.hmtl
Mike Taylor [Fri, 29 Nov 2013 18:49:57 +0000 (18:49 +0000)]
New file, templates.html
Mike Taylor [Fri, 29 Nov 2013 18:47:57 +0000 (18:47 +0000)]
Resolve
Mike Taylor [Fri, 29 Nov 2013 17:26:14 +0000 (17:26 +0000)]
Remove "mkwsTemplateSummary", since it's now in the MKWS code.
Mike Taylor [Fri, 29 Nov 2013 17:25:49 +0000 (17:25 +0000)]
Provide default "Summary" template, rending the same as the old
hardwired code.
Mike Taylor [Fri, 29 Nov 2013 17:24:11 +0000 (17:24 +0000)]
Replace mkwsTemplateRecord (which is now in the MKWS code) with mkwsTemplateSummary.
Mike Taylor [Fri, 29 Nov 2013 17:22:49 +0000 (17:22 +0000)]
renderSummary() simplified by deletion of legacy code.
Mike Taylor [Fri, 29 Nov 2013 17:22:14 +0000 (17:22 +0000)]
Move rendering of full record back up into my_onshow()
renderSummary(hit) now uses Summary template if provided.
Mike Taylor [Fri, 29 Nov 2013 16:53:07 +0000 (16:53 +0000)]
Simplify string-building.
Mike Taylor [Fri, 29 Nov 2013 16:51:55 +0000 (16:51 +0000)]
Move code out of my_onshow() into new function renderSummary().
Mike Taylor [Fri, 29 Nov 2013 12:50:16 +0000 (12:50 +0000)]
Change quoting style of handlebars template invocation, just to have a
character-for-character match with the template hardwired into
mkws.html
Mike Taylor [Fri, 29 Nov 2013 12:49:24 +0000 (12:49 +0000)]
Remove defaultRenderDetails() and renderField(), which are no longer used.
Mike Taylor [Fri, 29 Nov 2013 12:48:00 +0000 (12:48 +0000)]
Remove old code that called defaultRenderDetails(), since now there is
always a template.
Mike Taylor [Fri, 29 Nov 2013 12:43:04 +0000 (12:43 +0000)]
function maybeLoadTemplate() renamed to loadTemplate()
Mike Taylor [Fri, 29 Nov 2013 12:42:29 +0000 (12:42 +0000)]
Provide defaultTemplate() function (for "Record" only, so far).
maybeLoadTemplate() now falls back to defaultTemplate() when no
template is provided in the HTML of an application.
Mike Taylor [Fri, 29 Nov 2013 11:30:03 +0000 (11:30 +0000)]
Location names now listed with #commaList instead of #each.
Mike Taylor [Fri, 29 Nov 2013 11:29:38 +0000 (11:29 +0000)]
Add #commaList helper.
Needed instead of #each to exactly emulate the old display.
Mike Taylor [Fri, 29 Nov 2013 11:06:55 +0000 (11:06 +0000)]
Remove now-unused Handlebars helper 'link'.
Mike Taylor [Fri, 29 Nov 2013 11:06:27 +0000 (11:06 +0000)]
Make links for md-electronic-url by hand instead of relying on
too-clever {{link}} helper.