clean:
rm -f $(DOCS)
+ rm -f *.drupal.html
distclean: clean uninstall
+push:
+ pandoc --toc README.markdown > README.drupal.html
+ pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html
+ cat README.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+ cat mkws-manual.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/323?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+
help:
- @echo "make [ all | install | clean | distclean ]"
+ @echo "make [ all | install | clean | distclean | push ]"
var mkws_config = {
// For now, we have to provide known-bad credentials to skip user/pw login: see bug MKSP-125
// Was: //sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX
- pp2_hostname: "x.sp-mkws.indexdata.com",
- sp_path: "service-proxy/",
- sp_auth_query: "command=auth&action=perconfig",
- sp_auth_credentials: "XXX/XXX",
- // ### This should automatically follow pp2_hostname
- pazpar2_url: "//x.sp-mkws.indexdata.com/service-proxy/",
+// pp2_hostname: "sp-mkws.indexdata.com",
+// sp_auth_path: "service-proxy/",
+// sp_auth_query: "command=auth&action=perconfig",
+// sp_auth_credentials: "XXX/XXX",
};
</script>
<script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
var config_default = {
use_service_proxy: true,
- pazpar2_url: "//mkws.indexdata.com/service-proxy/",
- service_proxy_auth: undefined, // generally rolled from the next three properties
- // Was: //mkws.indexdata.com/service-proxy-auth
- pp2_hostname: "mkws.indexdata.com",
- sp_path: "service-proxy-auth",
- sp_auth_query: undefined, // Will be: "command=auth&action=perconfig",
- sp_auth_credentials: undefined,
+ pazpar2_url: undefined,
+ pp2_hostname: "sp-mkws.indexdata.com",
+ pp2_path: "service-proxy",
+ service_proxy_auth: undefined,
+ sp_auth_path: "service-proxy/",
+ sp_auth_query: "command=auth&action=perconfig",
+ sp_auth_credentials: "XXX/XXX", // Should be undefined: see bug MKSP-125.
lang: "",
sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
perpage_options: [10, 20, 30, 50],
mkws.pazpar2_url = function() {
- return mkws.config.pazpar2_url;
+ if (mkws.config.pazpar2_url) {
+ mkws.log("using pre-baked pazpar2_url '" + mkws.config.pazpar2_url + "'");
+ return mkws.config.pazpar2_url;
+ } else {
+ var s = document.location.protocol + "//" + mkws.config.pp2_hostname + "/" + mkws.config.pp2_path + "/";
+ mkws.log("generated pazpar2_url '" + s + "'");
+ return s;
+ }
};
}
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
- if (mkws.config.pazpar2_url.match(/^\/\//)) {
+ if (mkws.pazpar2_url().match(/^\/\//)) {
mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url;
log("adjusted protocol independent link to " + mkws.pazpar2_url());
}
} else {
var s = '//';
s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
- s += '/' + config.sp_path;
+ s += '/' + config.sp_auth_path;
var q = config.sp_auth_query;
if (q) {
s += '?' + q;