text-align: right;
font-size: small;
}
+
+table { background: #ddd; border-collapse: collapse; }
+tr.header { color: #fff; background: #888; }
+table, th, td { border: 1px solid #ccc; }
+td { vertical-align: top; }
+td, th { padding: 0.3em 0.6em; }
The following is
[a complete MKWS-based searching application](//example.indexdata.com/simple.html):
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>MKWS demo client</title>
- <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
- <link rel="stylesheet" href="//mkws.indexdata.com/mkws.css" />
- </head>
- <body>
- <div class="mkws-search"></div>
- <div class="mkws-results"></div>
- </body>
- </html>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>MKWS demo client</title>
+ <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
+ <link rel="stylesheet" href="//mkws.indexdata.com/mkws.css" />
+ </head>
+ <body>
+ <div class="mkws-search"></div>
+ <div class="mkws-results"></div>
+ </body>
+ </html>
Go ahead, try it! Simply put the above in a file (e.g index.html),
drop it into a folder accessible with an ordinary web-server (e.g
To see all of these working together, just put them all into the HTML
`<body>` like so:
- <div class="mkws-switch"></div>
- <div class="mkws-lang"></div>
- <div class="mkws-progress"></div>
- <div class="mkws-search"></div>
- <div class="mkws-results"></div>
- <div class="mkws-targets"></div>
- <div class="mkws-stat"></div>
+ <div class="mkws-switch"></div>
+ <div class="mkws-lang"></div>
+ <div class="mkws-progress"></div>
+ <div class="mkws-search"></div>
+ <div class="mkws-results"></div>
+ <div class="mkws-targets"></div>
+ <div class="mkws-stat"></div>
The full set of supported widgets is described in the
-reference guide below.
+reference guide
+[below](#widgets).
Widget team
-----------
parameters into the `mkws_config` object. So the HTML header looks
like this:
- <script type="text/javascript">
- var mkws_config = {
- lang_options: [ "en", "da" ]
- lang: "da",
- sort_default: "title",
- query_width: 60
- };
- </script>
- <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+ <script type="text/javascript">
+ var mkws_config = {
+ lang_options: [ "en", "da" ]
+ lang: "da",
+ sort_default: "title",
+ query_width: 60
+ };
+ </script>
+ <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
This configuration restricts the set of available UI languages English
and Danish (omitting German), sets the default to Danish (rather than
separately. In this case, `mkws-results` can be omitted, and the
following lower-level widgets provided instead:
-* `mkws-termlists` -- provides the facets
+* `mkws-facets` -- provides the facets
* `mkws-ranking` -- provides the options for how records are sorted and
how many are included on each page of results.
`type="text/x-handlebars-template"` attribute. For example, to override the
pager template you would include this in your document:
- <script class="mkws-template-pager" type="text/x-handlebars-template">
- ...new Pager template
- </script>
+ <script class="mkws-template-pager" type="text/x-handlebars-template">
+ ...new Pager template
+ </script>
The Facet template has a special feature where you can override it on
a per-facet basis by adding a dash and the facet name as a suffix eg.
this to work you'll need to enable verbose output from Handlebars which is done
by including this line or similar:
- <script>Handlebars.logger.level = 1;</script>
+ <script>Handlebars.logger.level = 1;</script>
Internationalisation
--------------------
the source via the address provided in the metadata as the first
element of `md-electronic-url`:
- <script class="mkws-template-summary" type="text/x-handlebars-template">
- <a href="{{md-electronic-url.[0]}}">
- <b>{{md-title}}</b>
- </a>
- {{#if md-title-remainder}}
- <span>{{md-title-remainder}}</span>
- {{/if}}
- {{#if md-title-responsibility}}
- <span><i>{{md-title-responsibility}}</i></span>
- {{/if}}
- </script>
+ <script class="mkws-template-summary" type="text/x-handlebars-template">
+ <a href="{{md-electronic-url.[0]}}">
+ <b>{{md-title}}</b>
+ </a>
+ {{#if md-title-remainder}}
+ <span>{{md-title-remainder}}</span>
+ {{/if}}
+ {{#if md-title-responsibility}}
+ <span><i>{{md-title-responsibility}}</i></span>
+ {{/if}}
+ </script>
For a more involved example where markup for multiple widgets is decorated with
[Bootstrap](http://getbootstrap.com/) classes and a custom Handlebars helper is
in a popup. The key part of such an application is this invocation of
the MKWS jQuery plugin:
- <div class="mkws-search"></div>
- <div class="mkws-popup" popup_width="1024" popup_height="650">
- <div class="mkws-results"></div>
- </div>
+ <div class="mkws-search"></div>
+ <div class="mkws-popup" popup_width="1024" popup_height="650">
+ <div class="mkws-results"></div>
+ </div>
The necessary scaffolding can be seen in an example application,
[popup.html](http://example.indexdata.com/popup.html).
in the reference section.
-Authentication and target configuration
----------------------------------------
-
-MKWS configures itself to use an account on a service hosted by
-`sp-mkws.indexdata.com`. By default, it sends no authentication
-credentials, allowing the appropriate account to be selected on the
-basis of referring URL or IP address.
-
-TODO REWRITE
-This account (username `demo`,
-password `demo`) provides access to about a dozen free data
-sources. Authentication onto this service is via an authentication URL
-on the same MKWS server, so no explicit configuration is needed.
-
-In order to search in a customised set of targets, including
-subscription resources, it's necessary to create an account with
-Index Data's hosted Service Proxy, and protect that account with
-authentication tokens (to prevent unauthorised use of subscription
-resources). For information on how to do this, see the next section.
-
-
MKWS target selection
=====================
+Introduction
+------------
+
MKWS accesses targets using the Pazpar2 metasearching engine. Although
Pazpar2 can be used directly, using a statically configured set of
targets, this usage is unusual. More often, Pazpar2 is fronted by the
Service Proxy (SP), which manages authentication, sessions, target
-selection, etc.
-
-This document assumes the SP is used, and explains how to go about
-making a set of targets (a "library") available, how to connect your
-MKWS application to that library, and how to choose which of the
-available targets to use.
+selection, etc. This document assumes the SP is used, and explains how
+to go about making a set of targets (a "library") available, how to
+connect your MKWS application to that library, and how to choose which
+of the available targets to use.
+
+By default MKWS configures itself to use an account on a service
+hosted by `sp-mkws.indexdata.com`. By default, it sends no
+authentication credentials, allowing the appropriate account to be
+selected on the basis of referring URL or IP address.
+
+If no account has been set up to recognise the referring URL of the
+application or the IP address of the client, then a default "MKWS
+Demo" account is used. This account (which can also be explicitly
+chosen by using the username `mkws`, password `mkws`) provides access
+to about a dozen free data sources.
+In order to search in a customised set of targets, including
+subscription resources, it's necessary to create an account with
+Index Data's hosted Service Proxy, and protect that account with
+authentication tokens (to prevent unauthorised use of subscription
+resources).
Maintaining the library
-----------------------
Admin). Specifically, those used by MKWS are generally maintained on
the "MKX Admin" installation at
<http://mkx-admin.indexdata.com/console/>
-
In general, Index Data will create a library for each customer, then
give the customer a username/password pair that they can use to enter
MKAdmin and administrate that library.
Once logged in, customers can select which targets to include (from
the list of several thousand that MKAdmin knows about), and make
-customer-specific modifications -- e.g. overriding the titles of the
-targets.
+customer-specific modifications to the target profiles --
+e.g. overriding the titles of the targets.
Most importantly, customers' administrators can add authentication
-credentials that the Service Proxy will used on their behalf when
+credentials that the Service Proxy will use on their behalf when
accessing subscription resources -- username/password pairs or proxies
to use for IP-based authentication. Note that **it is then crucial to
secure the library from use by unauthorised clients**, otherwise the
* Create an end-user account
* Depending on what authentication method it be used, set the
User Access account's username and password, or referring URL, or
- Service Proxy hostname, or IP-address range.
+ IP-address range.
If your MWKS application runs at a well-known, permanent address --
<http://yourname.com/app.html>, say -- you can set the User Access
record so that this originating URL is recognised by setting it into
-the "Referring URL" field.
-
-If your application accesses the Service Proxy by a unique virtual
-hostname -- yourname.sp-mkws.indexdata.com, say -- you can tie the use
-of this hostname to your library by setting the User Access record's
-"Host Name" field to name of the host where the SP is accessed. **Note
-that this is not secure, as other applications can use this virtual
-hostname to gain access to your library.**
+the "Referring URL" field. Then the application will always use that
+library that this User Access record is associated with (unless it
+sends a username/password pair to override this default).
Or if your application's users are coming from a well-known range of
IP-address space, you can enter the range in the "IP Ranges"
password credentials. This is a useful approach in several situations,
including when you need to specify the use of a different library from
usual one. To arrange for this, set the username and password as a
-single string separated by a slash -- e.g. "mike/swordfish" -- into
+single string separated by a slash -- e.g. `mike/swordfish` -- into
the User Access record's Authentication field.
You can set multiple fields into a single User Access record; or
create multiple User Access records. For example, a single User Access
-record can specify both a Referring URL a username/password pair that
-can be used when running an application from a different URL. But if
-multiple Referring URLs are needed, then each must be specified in its
-own User Access record.
-
-### Tell the application to use the library
-
-In the HTML of the application, tell MKWS to authenticate on to the
-Service Proxy. When referer-based or IP-based authentication is used,
-this is very simple:
-
- <script type="text/javascript">
- var mkws_config = { service_proxy_auth:
- "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig" };
- </script>
-
-> TODO This should be the default setting: see **MKWS-251**.
-
-And ensure that access to the MWKS application is from the correct
-Referrer URL or IP-range.
-
-### (Optional): access by a different virtual hostname
-
-When hostname-based authentication is in use, it's necessary to access
-the Service Proxy as the correctly named virtual host. This can be
-done by setting the `service_proxy_auth` configuration item to a
-URL containing that hostname, such as
-`//yourname.sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig`
-
-> TODO It should be possible to change just the hostname without
-> needing to repeat the rest of the URL (protocol, path, query): see
-> **MKWS-252**.
-
-> TODO When changing the SP authentication URL, the Pazpar2 URL should
-> in general change along with it: see **MKWS-253**.
+record can specify both a Referring URL and a username/password pair
+that can be used when running an application from a different URL. But
+if multiple Referring URLs are needed, then each must be specified in
+its own User Access record.
### (Optional): embed credentials for access to the library
When credential-based authentication is in use (username and
password), it's necessary to pass these credentials into the Service
-Proxy when establishing the session. This can most simply be done just
-by setting the `service_proxy_auth` configuration item to a URL such as
-`//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=mike&password=swordfish`
+Proxy when establishing the session. This is done
+by setting the `sp_auth_credentials` configuration item to a string
+containing the username and password separated by a slash:
-> TODO It should be possible to add the username and password to the
-> configuration without needing to repeat the rest of the URL: see
-> **MKWS-254**.
+ mkws_config = { sp_auth_credentials: "mike/swordfish" };
### (Optional): conceal credentials from HTML source
-Using a credential-based Service-Proxy authentication URL such as the
-one above reveals the the credentials to public view -- to anyone who
-does View Source on the MKWS application. This may be acceptable for
-some libraries, but is intolerable for those which provide
-authenticated access to subscription resources.
-
-In these circumstances, a more elaborate approach is necessary. The
-idea is to make a URL local to the customer that is used for
-authentication onto the Service Proxy, hiding the credentials in a
-local rewrite rule. Then local mechanisms can be used to limit access
-to that local authentication URL. Here is one way to do it when
+Using credential-based authentication settings such as those above
+reveals the the credentials to public view -- to anyone who does View
+Source on the MKWS application. This may be acceptable for some
+libraries, but is intolerable for those which provide authenticated
+access to subscription resources.
+
+In these circumstances, a different approach is
+necessary. Referer-based or IP-based authentication may be
+appropriate. But if these are not possible, then a more elaborate
+approach can be used to hide the credentials in a web-server
+configuration that is not visible to users.
+
+The idea is to make a Service Proxy authentication URL local to the
+customer, hiding the credentials in a rewrite rule in the local
+web-server's configuration. Then local mechanisms can be used to limit
+access to that local authentication URL. Here is one way to do it when
Apache2 is the application's web-server, which we will call
-yourname.com:
+yourname.com`:
Step 1: add a rewriting authentication alias to the configuration:
RewriteRule /spauth/ http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=U&password=PW [P]
Step 2: set the MKWS configuration item `service_proxy_auth` to
-<http://yourname.com/spauth/>
+`http://yourname.com/spauth/`.
-Step 3: protect access to the local path <http://yourname.com/spauth/>
+Step 3: protect access to the local path `http://yourname.com/spauth/`
(e.g. using a `.htaccess` file).
Reference guide
===============
+Widgets
+-------
+
+The following widgets are provided in the core set. (Others can be
+added: see the [MKWS developers' guide](mkws-developer.html).)
+
+----
+Name Description
+---- -----------
+`auth-name` Initially empty, it updates itself to shows the name
+ of the library that the application is logged in as
+ when authentication is complete.
+
+`builder` A button which, when pressed, analyses the current
+ settings of the team that it is a part of, and
+ generates the HTML for an auto-searching element
+ that will replicate the present search. This HTML is
+ displayed in an alert box: it is intended that this
+ widget be subclassed to store the generated widget
+ definitions in more useful places.
+
+`categories` Obtains from the Service Proxy a list of the target
+ categories associated with the library in use, and
+ displays them in a drop-down list. When a category
+ is selected, searches are limited to the targets
+ that are part of that category.
+
+`config` This widget has no functionality of its own, but its
+ configuration is copied up into its team, allowing
+ it to affect other widgets in the team. This is the
+ only way to set configuration items at the team
+ level.
+
+`console-builder` Like the `builder` widget, but emits the generated
+ HTML on the JavaScript console. This exists to
+ provide an example of how to subclass the `builder`
+ widget.
+
+`cover-art` Displays cover art for a book by searching in
+ Amazon. Often used with an `autosearch` attribute to
+ indicate what book to display. For example,
+ `<div class="mkws-cover-art" autosearch="isbn=1291177124"></div>`
+ displays cover art for _All Yesterdays: Unique and
+ Speculative Views of Dinosaurs and Other Prehistoric
+ Animals_.
+ For this widget to work, a library that includes the
+ AmazonBooks target must be used. For example, the
+ "DEMO AmazonBooks for MKWS" account, which can be
+ selected with `sp_auth_credentials="mkws-amazon/mkws"`.
+
+`details` This widget is generated by the toolkit itself to
+ hold the full details of records that are initially
+ listed in summary form.
+
+`done` Initially empty, this widget is set to display
+ "Search complete: found _n_ records" when all
+ targets have completed their work, either returning
+ a hit-count or an error. The message displayed can
+ be changed by overriding the `done` template using
+ `<script class="mkws-template-done" type="text/x-handlebars-template">`.
+
+`facet` x
+
+`facets` x
+
+`google-image` x
+
+`images` x
+
+`lang` x
+
+`log` x
+
+`lolcat` x
+
+`motd-container` x
+
+`motd` x
+
+`navi` x
+
+`pager` x
+
+`per-page` x
+
+`progress` x
+
+`query` x
+
+`ranking` x
+
+`record` x
+
+`records` x
+
+`reference` x
+
+`results` x
+
+`search-form` x
+
+`search` x
+
+`sort` x
+
+`stat` x
+
+`switch` x
+
+`targets` x
+----
+
+
Configuration object
--------------------
mapping the English-language strings of the UI into their equivalents
in the specified language. For example:
- var mkws_config = {
- language_French: {
- "Authors": "Auteurs",
- "Subjects": "Sujets",
- // ... and others ...
- }
- }
+ var mkws_config = {
+ language_French: {
+ "Authors": "Auteurs",
+ "Subjects": "Sujets",
+ // ... and others ...
+ }
+ }
The following strings occurring in the UI can be translated:
`Displaying`,
`Search`,
`Sort by`,
`Targets`,
-`Termlists`,
+`Facets`,
`and show`,
`found`,
`of`,
toolkit are used, so it's necessary to include both CSS and JavaScript
from that toolkit. The relevant lines are:
- <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
- <link rel="stylesheet" type="text/css"
- href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+ <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+ <link rel="stylesheet" type="text/css"
+ href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
- <div class="mkws-search"></div>
- <div class="mkws-popup" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
- <div class="mkws-switch"></div>
- <div class="mkws-lang"></div>
- <div class="mkws-results"></div>
- <div class="mkws-targets"></div>
- <div class="mkws-stat"></div>
- </div>
+ <div class="mkws-search"></div>
+ <div class="mkws-popup" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
+ <div class="mkws-switch"></div>
+ <div class="mkws-lang"></div>
+ <div class="mkws-results"></div>
+ <div class="mkws-targets"></div>
+ <div class="mkws-stat"></div>
+ </div>
----
Element Type Default Description
Set, it's necessary to understand that structure of the HTML elements that are
generated within the widgets. This knowledge make it possible, for example,
to style each `<div>` with class `term` but only when it occurs inside an
-element with class `mkws-termlists`, so as to avoid inadvertently styling other
+element with class `mkws-facets`, so as to avoid inadvertently styling other
elements using the same class in the non-MKWS parts of the page.
The HTML structure is as follows. As in CSS, #ID indicates a unique identifier
and .CLASS indicates an instance of a class.
- #mkwsSwitch
- a*
-
- #mkwsLang
- ( a | span )*
-
- #mkwsSearch
- form
- input#mkwsQuery type=text
- input#mkwsButton type=submit
-
- #mkwsBlanket
- (no contents -- used only for masking)
-
- #mkwsResults
- table
- tbody
- tr
- td
- #mkwsTermlists
- div.title
- div.facet*
- div.termtitle
- ( a span br )*
- td
- div#mkwsRanking
- form#mkwsSelect
- select#mkwsSort
- select#mkwsPerpage
- #mkwsPager
- #mkwsNavi
- #mkwsRecords
- div.record*
- span (for sequence number)
- a (for title)
- span (for other information such as author)
- div.details (sometimes)
- table
- tbody
- tr*
- th
- td
- #mkwsTargets
- #mkwsBytarget
- table
- thead
- tr*
- td*
- tbody
- tr*
- td*
-
- #mkwsStat
- span.head
- span.clients
- span.records
+ #mkwsSwitch
+ a*
+
+ #mkwsLang
+ ( a | span )*
+
+ #mkwsSearch
+ form
+ input#mkwsQuery type=text
+ input#mkwsButton type=submit
+
+ #mkwsBlanket
+ (no contents -- used only for masking)
+
+ #mkwsResults
+ table
+ tbody
+ tr
+ td
+ #mkwsTermlists
+ div.title
+ div.facet*
+ div.termtitle
+ ( a span br )*
+ td
+ div#mkwsRanking
+ form#mkwsSelect
+ select#mkwsSort
+ select#mkwsPerpage
+ #mkwsPager
+ #mkwsNavi
+ #mkwsRecords
+ div.record*
+ span (for sequence number)
+ a (for title)
+ span (for other information such as author)
+ div.details (sometimes)
+ table
+ tbody
+ tr*
+ th
+ td
+ #mkwsTargets
+ #mkwsBytarget
+ table
+ thead
+ tr*
+ td*
+ tbody
+ tr*
+ td*
+
+ #mkwsStat
+ span.head
+ span.clients
+ span.records
- - -
--- /dev/null
+.mkws-facets {
+ background: white;
+}
+.mkws-facet {
+ background: white;
+}
<script type="text/javascript" src="tools/htdocs/mkws.js"></script>
<style type="text/css">
- .mkws-termlists div.facet {
+ .mkws-facets div.facet {
float:left;
width: 30%;
margin: 0.3em;
<script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
<script type="text/javascript" src="tools/htdocs/mkws.js"></script>
<style type="text/css">
- .mkws-termlists div.facet {
+ .mkws-facets div.facet {
float:left;
width: 30%;
margin: 0.3em;
<tr>
<td>
<div style="height:300px; overflow: hidden">
- <div class="mkws-termlists"></div>
+ <div class="mkws-facets"></div>
</div>
</td>
</tr>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
<style type="text/css">
- .mkws-termlists div.facet {
+ .mkws-facets div.facet {
float:left;
width: 30%;
margin: 0.3em;
<tr>
<td>
<div style="height:300px; overflow: hidden">
- <div class="mkws-termlists"></div>
+ <div class="mkws-facets"></div>
</div>
</td>
</tr>
"Subject": "موضوع",
"Location": "موقع",
// Facet heading and individual facet names
- "Termlists": "العضو الأجل",
+ "Facets": "العضو الأجل",
"Sources": "مصادر",
"Subjects": "المواضيع",
"Authors": "الكتاب",
sort='relevance'
targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
>News will appear here</div>
- <div class='mkws-termlists mkws-team-news'/>
+ <div class='mkws-facets mkws-team-news'/>
</td>
<td width="30%">
<h2>Blog</h2>
sort='relevance'
targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
>Blog entries will appear here</div>
- <div class='mkws-termlists mkws-team-blog'/>
+ <div class='mkws-facets mkws-team-blog'/>
</td>
</tr>
</table>
<link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
<style type="text/css">
- .mkws-termlists div.facet {
+ .mkws-facets div.facet {
float:left;
width: 30%;
margin: 0.3em;
<tr>
<td>
<div style="height:300px; overflow: hidden">
- <div class="mkws-termlists"></div>
+ <div class="mkws-facets"></div>
</div>
</td>
</tr>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<body>
<div class="mkws-auth-name"></div>
<div class="mkws-switch"></div>
- <div class="mkws-lang" data-mkws-config='{ "lang_options": [ "en", "da" ] }'></div>
+ <div class="mkws-lang" data-mkws-config='{ "lang_options": [ "en", "de" ] }'></div>
<div class="mkws-progress"></div>
<div class="mkws-search"></div>
<div class="mkws-results"></div>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<script type="text/javascript" src="src/mkws-filter.js"></script>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
<title>MKWS demo client</title>
<script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
<link rel="stylesheet" href="//mkws.indexdata.com/mkws.css" />
+ <link rel="stylesheet" href="custom.css" />
</head>
<body>
<div class="mkws-switch"></div>
<div class="mkws-results"></div>
<div class="mkws-targets"></div>
<div class="mkws-stat"></div>
- <div class="mkws-builder"></div>
</body>
</html>
<script type="text/javascript" src="src/mkws-widget.js"></script>
<script type="text/javascript" src="src/mkws-widget-main.js"></script>
- <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+ <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
<script type="text/javascript" src="src/mkws-widget-authname.js"></script>
<script type="text/javascript" src="src/mkws-widget-categories.js"></script>
<script type="text/javascript" src="src/mkws-widget-log.js"></script>
mkws-filter.js \
mkws-widget.js \
mkws-widget-main.js \
- mkws-widget-termlists.js \
+ mkws-widget-facets.js \
mkws-widget-authname.js \
mkws-widget-categories.js \
mkws-widget-log.js \
"Subjects": "Schlagwörter",
"Sources": "Daten und Quellen",
"source": "datenquelle",
- "Termlists": "Termlisten",
+ "Facets": "Termlisten",
"Next": "Weiter",
"Prev": "Zurück",
"Search": "Suche",
"Subjects": "Emner",
"Sources": "Kilder",
"source": "kilder",
- "Termlists": "Termlists",
+ "Facets": "Termlists",
"Next": "Næste",
"Prev": "Forrige",
"Search": "Søg",
'MOTDContainer': 'motd-container',
'Perpage': 'per-page',
'SearchForm': 'search-form',
- 'ReferenceUniverse': 'reference-universe'
+ 'ReferenceUniverse': 'reference-universe',
+ 'Termlists': 'facets'
};
// Annoyingly, there is no built-in way to invert a hash
var _new2old = {};
function onTerm(data) {
log("term");
- queue("termlists").publish(data);
+ queue("facets").publish(data);
}
function onShow(data, teamName) {
params.onstat = onStat;
log("setting stat callback");
}
- if (m_queues.termlists && config.facets.length) {
+ if (m_queues.facets && config.facets.length) {
params.onterm = onTerm;
log("setting term callback");
}
--- /dev/null
+mkws.registerWidgetType('facets', function() {
+ // Initially hide the facets; display when we get results
+ var that = this;
+ var team = this.team;
+ team.queue("facets").subscribe(function(data) {
+ that.node.addClass("active");
+ });
+
+ var template = team.loadTemplate(this.config.template || "facets");
+ this.node.html(template({
+ team: team.name(),
+ facets: this.config.facets
+ }));
+ this.autosearch();
+});
+
+
+mkws.registerWidgetType('facet', function() {
+ var facetConfig = {
+ xtargets: [ "Sources", 16, false ],
+ subject: [ "Subjects", 10, true ],
+ author: [ "Authors", 10, true ]
+ }
+ var that = this;
+ var team = this.team;
+ var name = that.config.facet;
+ var ref = facetConfig[name] || [ "Unknown", 10, true ];
+ var caption = this.config['facet_caption_' + name] || ref[0];
+ var max = parseInt(this.config['facet_max_' + name] || ref[1]);
+ var pzIndex = ref[2] ? name : null;
+
+ that.toString = function() {
+ return '[Widget ' + team.name() + ':' + that.type + '(' + name + ')]';
+ };
+
+ team.queue("facets").subscribe(function(data) {
+ data = data[name];
+ var terms = [];
+ var teamName = team.name();
+ for (var i = 0; i < data.length && i < max; i++) {
+ var linkdata = "";
+ var action = "";
+ if (!pzIndex) {
+ // Special case: target selection
+ linkdata += ('target_id='+data[i].id+' ');
+ if (!team.targetFiltered(data[i].id)) {
+ action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+ }
+ } else {
+ action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
+ }
+ linkdata += 'onclick="' + action + ';return false;"';
+ terms.push({
+ term: data[i].name,
+ field: data[i].id,
+ count: data[i].freq,
+ linkdata: linkdata
+ });
+ }
+ // configured template > facet specific template > default facet template
+ var template;
+ if (that.config.template) {
+ template = team.loadTemplate(that.config.template);
+ } else {
+ template = team.loadTemplate("facet-" + name);
+ if (template) {
+ that.log("Using facet-" + name + " template.")
+ } else {
+ that.log("No " + name + " specific template, using default.")
+ template = team.loadTemplate("facet");
+ }
+ }
+ that.node.html(template({
+ name: name,
+ caption: caption,
+ query: that.config.query,
+ terms: terms
+ }));
+ });
+ this.autosearch();
+});
cur.id = data[i].id;
cur.hits = data[i].hits;
cur.diagnostic = data[i].diagnostic;
+ cur.message = data[i].message;
cur.records = data[i].records;
cur.state = data[i].state;
cleandata.push(cur);
+++ /dev/null
-mkws.registerWidgetType('termlists', function() {
- // Initially hide the termlists; display when we get results
- var that = this;
- var team = this.team;
- team.queue("termlists").subscribe(function(data) {
- that.node.addClass("active");
- });
-
- var template = team.loadTemplate(this.config.template || "termlists");
- this.node.html(template({
- team: team.name(),
- facets: this.config.facets
- }));
- this.autosearch();
-});
-
-
-mkws.registerWidgetType('facet', function() {
- var facetConfig = {
- xtargets: [ "Sources", 16, false ],
- subject: [ "Subjects", 10, true ],
- author: [ "Authors", 10, true ]
- }
- var that = this;
- var team = this.team;
- var name = that.config.facet;
- var ref = facetConfig[name] || [ "Unknown", 10, true ];
- var caption = this.config['facet_caption_' + name] || ref[0];
- var max = parseInt(this.config['facet_max_' + name] || ref[1]);
- var pzIndex = ref[2] ? name : null;
-
- that.toString = function() {
- return '[Widget ' + team.name() + ':' + that.type + '(' + name + ')]';
- };
-
- team.queue("termlists").subscribe(function(data) {
- data = data[name];
- var terms = [];
- var teamName = team.name();
- for (var i = 0; i < data.length && i < max; i++) {
- var linkdata = "";
- var action = "";
- if (!pzIndex) {
- // Special case: target selection
- linkdata += ('target_id='+data[i].id+' ');
- if (!team.targetFiltered(data[i].id)) {
- action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
- }
- } else {
- action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
- }
- linkdata += 'onclick="' + action + ';return false;"';
- terms.push({
- term: data[i].name,
- field: data[i].id,
- count: data[i].freq,
- linkdata: linkdata
- });
- }
- // configured template > facet specific template > default facet template
- var template;
- if (that.config.template) {
- template = team.loadTemplate(that.config.template);
- } else {
- template = team.loadTemplate("facet-" + name);
- if (template) {
- that.log("Using facet-" + name + " template.")
- } else {
- that.log("No " + name + " specific template, using default.")
- template = team.loadTemplate("facet");
- }
- }
- that.node.html(template({
- name: name,
- caption: caption,
- query: that.config.query,
- terms: terms
- }));
- });
- this.autosearch();
-});
--- /dev/null
+{{!
+Facets, a container of all configured facets.
+
+team - the current team
+facets - array of facet names
+}}
+
+<div class="mkws-facets-title mkwsTermlistsTitle">{{mkws-translate "Facets"}}</div>
+{{#each facets}}
+ <div class="mkws-facet mkwsFacet mkws-team-{{../team}}" data-mkws-facet="{{this}}"></div>
+{{/each}}
{{~else~}}
<a href="{{{url}}}">{{code}}</a>
{{~/if~}}
- {{#unless last}}
+ {{#unless @last}}
|
{{/unless}}
{{/each}}
}}
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
- <td class="mkws-termlists-container-wide mkws-team-{{team}}" width="250" valign="top">
- <div class="mkws-termlists mkwsTermlists mkws-team-{{team}}"></div>
+ <td class="mkws-facets-container-wide mkws-team-{{team}}" width="250" valign="top">
+ <div class="mkws-facets mkwsTermlists mkws-team-{{team}}"></div>
</td>
<td class="mkws-motd-container mkwsMOTDContainer mkws-team-{{team}}" valign="top">
<div class="mkws-ranking mkwsRanking mkws-team-{{team}}"></div>
</tr>
<tr>
<td colspan="2">
- <div class="mkws-termlists-container-narrow mkws-team-{{team}}"></div>
+ <div class="mkws-facets-container-narrow mkws-team-{{team}}"></div>
</td>
</tr>
</table>
data:
id - target id, an opaque identifier
hits - number of hits for this target, or "Error" if an error has occurred
- diagnostic - diagnostic code returned by target, if any. May be numeric or human-readable
+ diagnostic - numeric diagnostic code returned by target; 0 if OK
+ message - message corresponding to diagnostic code, if any.
records - number of record retrieved from target
state - target state (Client_Idle, Client_Working, Client_Disconnected or Client_Error)
}}
<tr>
<td>{{{id}}}</td>
<td>{{hits}}</td>
- <td>{{diagnostic}}</td>
+ <td>
+ {{#if message}}
+ {{diagnostic}} ({{message}})
+ {{/if}}
+ </td>
<td>{{records}}</td>
<td>{{state}}</td>
</tr>
+++ /dev/null
-{{!
-Termlists, a container of all configured facets.
-
-team - the current team
-facets - array of facet names
-}}
-
-<div class="mkws-termlists-title mkwsTermlistsTitle">Termlists</div>
-{{#each facets}}
- <div class="mkws-facet mkwsFacet mkws-team-{{../team}}" data-mkws-facet="{{this}}"></div>
-{{/each}}
# be ignored
eval {
require BSD::Resource;
- BSD::Resource::setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
+ BSD::Resource::setrlimit( "RLIMIT_CPU", $timeout, 2 * $timeout )
+ or die "Cannot set CPU limit: $!\n";
};
if ($@) {
- warn "WARNING: things would go more nicely with the BSD::Resource package\n";
+ warn
+ "WARNING: things would go more nicely with the BSD::Resource package\n";
}
-
#
-# use fork/exec instead system()
+# configure signal handlers
#
-$pid = fork();
-die "fork() failed: $!" unless defined $pid;
+$SIG{ALRM} = sub {
+ my $pgid = getpgrp();
-# child
-if ($pid) {
- alarm($timeout);
- exec(@system) or die "exec @system: $!\n";
-}
+ # kill process group
+ kill "INT", -$pgid;
+};
-# parent
-else { }
+# don't kill ourself
+$SIG{INT} = "IGNORE";
+
+alarm($timeout);
+
+system(@system) == 0
+ or die "system @system failed: $?";
1;
+
});
});
-describe("Check Termlist", function () {
+describe("Check Facets", function () {
var $ = mkws.$;
- it("found Termlist", function () {
- var termlist = $("div.mkws-termlists");
- debug("Termlist success: " + termlist.length);
- expect(termlist.length).toBe(1);
+ it("found Facets", function () {
+ var facets = $("div.mkws-facets");
+ debug("Facet success: " + facets.length);
+ expect(facets.length).toBe(1);
waitsFor(function () {
return $("div.mkws-facet[data-mkws-facet='xtargets']").length == 1 ? true : false;
// everything displayed?
runs(function () {
var sources = $("div.mkws-facet[data-mkws-facet='xtargets']");
- debug("Termlist sources success: " + sources.length);
+ debug("Facet sources success: " + sources.length);
expect(sources.length).toBe(1);
var subjects = $("div.mkws-facet[data-mkws-facet='subject']");
# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
PHANTOMJS_TIMEOUT=30
-PHANTOMJS= ../node_modules/phantomjs/bin/phantomjs
+PHANTOMJS= perl ../bin/bomb.pl --timeout=${PHANTOMJS_TIMEOUT} ../node_modules/phantomjs/bin/phantomjs
IMAGES= ./images
SCREENSHOT_WIDTH_HEIGHT= 1000 1200
PERL_SCRIPTS= ../bin/bomb.pl
clean:
rm -f index-*.html
+ rm -f iframe-*.html
rm -f ${IMAGES}/*.png
distclean: clean
${PHANTOMJS} ${PROG} ${PHANTOMJS_URL} ${IMAGES}/tmp.$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}; \
mv -f ${IMAGES}/tmp.$$file.png ${IMAGES}/$$file.png
-screenshots: clean estimate-time
+screenshots: clean estimate-time iframe
for t in ${TESTS}; do \
for i in $$(cat url.$$t); do \
${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot; \
index:
( cd ${IMAGES}; ls -tr ${PREFIX}.*.png | perl -ne 'chomp; print qq{<h2>$$_</h2><img src="'${IMAGES}/'$$_"/><br/><br/><p/>\n}' ) > index-${PREFIX}.html
+iframe: index-iframe-demo
+index-iframe-demo:
+ ( cat url.demos | perl -ne 'chomp; print qq{<h2>$$_</h2><iframe width="900px" height="600px" src="$$_"></iframe>\n}' ) > iframe-demos.html
+
help:
@echo "make [ all | clean | distclean ]"
@echo " [ screenshots ]"
- @echo " [ screenshot | index ]"
+ @echo " [ screenshot | index | iframe ]"
@echo ""
@echo "Examples: "
@echo ""
http://example.indexdata.com/popup.html
http://example.indexdata.com/auto.html
http://example.indexdata.com/localauth.html
+http://www.indexdata.com/news/2014/06/using-smart-widgets-integrate-information-access
+http://example.indexdata.com/topic.html?q=sushi
+http://example.indexdata.com/prettysimple.html
http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi2
http://boston.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
-http://example.indexdata.com/topic.html?q=sushi
-http://example.indexdata.com/simple.html
-
<VirtualHost *:80>
ServerName mkws.indexdata.com
+ ServerAlias mkws01.indexdata.com
+ ServerAlias mkws02.indexdata.com
ErrorLog /var/log/apache2/mkws-error.log
CustomLog /var/log/apache2/mkws-access.log combined
DocumentRoot /home/indexdata/mkws/tools/htdocs
Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
- Alias /pazpar2/ /home/indexdata/pazpar2/
+ Alias /pazpar2/ /usr/share/pazpar2/
RewriteEngine on
RewriteLogLevel 1
<VirtualHost *:80>
ServerName x.mkws.indexdata.com
- ErrorLog /opt/local/apache2/logs/mkws-error.log
- CustomLog /opt/local/apache2/logs/mkws-access.log combined
+ ErrorLog /var/log/apache2/mkws-error.log
+ CustomLog /var/log/apache2/mkws-access.log combined
- DocumentRoot /usr/local/src/git/mkws/tools/htdocs
- Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
- Alias /pazpar2/ /usr/local/src/git/pazpar2/
+ DocumentRoot /Users/mike/git/work/mkws/tools/htdocs
+ Alias /libjs-pz2/ /Users/mike/git/work/libjs-pz2/
+ Alias /pazpar2/ /Users/mike/git/work/pazpar2/
RewriteEngine on
RewriteLogLevel 1
- RewriteLog /opt/local/apache2/logs/spclient-rewrite.log
+ RewriteLog /var/log/apache2/spclient-rewrite.log
RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
# For MKC Service Proxy
Allow from all
</Directory>
</VirtualHost>
-
-<VirtualHost *:80>
- ServerName x.example.indexdata.com
- ErrorLog /opt/local/apache2/logs/example-error.log
- CustomLog /opt/local/apache2/logs/example-access.log combined
-
- DocumentRoot /usr/local/src/git/mkws/examples/htdocs
- Alias /tools/htdocs/ /usr/local/src/git/mkws/tools/htdocs/
- Alias /src/ /usr/local/src/git/mkws/src/
- Alias /jasmine/ /usr/local/src/git/mkws/examples/jasmine/
- Alias /test/ /usr/local/src/git/mkws/test/
-
- # Needed on Mac, which locks Apache down hard by default.
- <Directory />
- Allow from all
- </Directory>
-</VirtualHost>
#
<VirtualHost *:80>
ServerName sp-mkws.indexdata.com
+ ServerAlias sp-mkws01.indexdata.com
+ ServerAlias sp-mkws02.indexdata.com
ErrorLog /var/log/apache2/sp-mkws-error.log
CustomLog /var/log/apache2/sp-mkws-access.log combined
--- /dev/null
+<VirtualHost *:80>
+ ServerName x.sp-mkws.indexdata.com
+
+ ErrorLog /var/log/apache2/sp-mkws-error.log
+ CustomLog /var/log/apache2/sp-mkws-access.log combined
+
+ DocumentRoot /Users/mike/git/work/mkws/tools/sp-htdocs
+
+ Header set Access-Control-Allow-Credentials true
+
+ ProxyPreserveHost On
+ # We could use any of the following:
+ ProxyPass /service-proxy/ http://x.sp-mkws.indexdata.com:8585/service-proxy/
+ ProxyPassReverse /service-proxy/ http://x.sp-mkws.indexdata.com:8585/service-proxy/
+
+ <Directory />
+ Allow from all
+ </Directory>
+
+# PerlOptions +Parent
+# PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
+# <Location /service-proxy>
+# PerlOutputFilterHandler MyApache2::SetACAO
+# </Location>
+</VirtualHost>
.mkwsLang, .mkws-lang,
.mkwsSwitch, .mkws-switch,
.mkwsSearch, .mkws-search,
-.mkwsTermlists, .mkws-termlists,
+.mkwsTermlists, .mkws-facets,
.mkwsFacet, .mkws-facet,
.mkwsRanking, .mkws-ranking,
.mkwsPager, .mkws-pager,
.mkwsRecord, .mkws-record,
.mkwsTargets, .mkws-targets,
.mkwsStat, .mkws-stat,
-.mkwsMOTD, .mkws-motd {
+.mkwsMOTD, .mkws-motd,
+.mkwsAuthname, .mkws-auth-name {
font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Verdana, Sans-Serif;
}
cursor: pointer;
}
+.mkwsAuthname, .mkws-auth-name {
+ color: #132194;
+}
+
.mkwsSearch input.mkwsQuery, .mkws-search input.mkws-query {
border: 2px inset #e0f0ff;
padding: 3px;
background: #f0f8ff;
}
-.mkwsTermlistsTitle, .mkws-termlists-title {
+.mkwsTermlistsTitle, .mkws-facets-title {
font-size: large;
font-weight: bold;
text-transform: uppercase;
}
-.mkwsTermlists, .mkws-termlists {
+.mkwsTermlists, .mkws-facets {
background: #d0e0ff;
padding: 0.7em;
font-size: small;
-webkit-border-top-right-radius: 10px;
}
-.mkwsTermlists.active, .mkws-termlists.active {
+.mkwsTermlists.active, .mkws-facets.active {
display: block;
}
--- /dev/null
+After editing the Service Proxy definition, it must be updated on both
+sansa and arya: see the Twiki entry on hosted search production boxes:
+https://twiki.indexdata.com/twiki/bin/view/ID/HostedSearchProd
plugins.statistics = com.indexdata.serviceproxy.plugins.StatisticsPlugin
-# Configuration properties for individual plug-ins
+# Configuration properties for individual plug-ins
# relay plugin, proxies commands through to Pazpar2
relay.PROXY_MODE = 3
relay.PARSE_RESPONSES = true
relay.CF_ENGINE_ADDRESS = localhost:9003
-# authn plugin, for torus based authentication
+# authn plugin, for torus based authentication
authn.TORUS_URL = http://mkc-admin.indexdata.com/torus2/identity.USERS/records/
authn.MASTER_TORUS_URL = http://mkc-admin.indexdata.com/torus2/admin.admin/records/
-authn.ACTION_SEQUENCE = check,login,referrer,constraint,ipauth
-authn.SPECIFIC_CONSTRAINT = hostName=${thisHost}
+authn.ACTION_SEQUENCE = check,login,referrer,ipauth,constraint
+authn.SPECIFIC_CONSTRAINT = token="mkws-default"
# categories plugin, for Torus-based target categories
categories.TORUS_BASEURL = http://mkc-admin.indexdata.com/torus2/
projects / mkws-moved-to-github.git / commitdiff