Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

[pazpar2-moved-to-github.git] / www / iphone / example_client.js

diff --git a/www/iphone/example_client.js b/www/iphone/example_client.js
index c0d57a7..3edabac 100644 (file)
--- a/www/iphone/example_client.js
+++ b/www/iphone/example_client.js
@@ -10,11 +10,12 @@ var showResponseType = '';
 // Facet configuration
 var querys = {'su': '', 'au': '', 'xt': ''};
 var query_client_server = {'su': 'subject', 'au': 'author', 'xt': 'xtargets'};
-var querys_server = {'subject': '', 'author': '', 'xtargets': ''};
-var useLimit = 0;
+var querys_server = {};
+var useLimit = 1;
+// Fail to get JSON working stabil.
 var showResponseType = 'xml';
 if (document.location.hash == '#pazpar2' || document.location.search.match("useproxy=false")) {
-    usesessions = false;
+    usesessions = true;
     pazpar2path = '/pazpar2/search.pz2';
     showResponseType = 'xml';
 }
@@ -33,7 +34,10 @@ my_paz = new pz2( { "onshow": my_onshow,
                     "onrecord": my_onrecord } );
 // some state vars
 var curPage = 1;
-var recPerPage = 20;
+var recPerPage = 100;
+var recToShowPageSize = 20;
+var recToShow = recToShowPageSize;
+var recIDs = {};
 var totalRec = 0;
 var curDetRecId = '';
 var curDetRecData = null;
@@ -56,7 +60,7 @@ function loginFormSubmit() {
        authCb, authCb);
 }
 
-function handleKeyPress(e, formId, focusId)  
+function handleKeyPress(e)  
 {  
   var key;  
   if(window.event)  
@@ -66,10 +70,10 @@ function handleKeyPress(e, formId, focusId)
 
   if(key == 13 || key == 10)  
   {  
-      onFormSubmitEventHandler();
-      focusElement = document.getElementById(focusId);
-      if (focusElement)
-         focusElement.focus();  
+      button = document.getElementById('button');
+      button.focus();
+      button.click();
+
       return false;  
   }  
   else  
@@ -134,6 +138,21 @@ function my_oninit() {
     my_paz.bytarget();
 }
 
+function showMoreRecords() {
+    var i = recToShow;
+    recToShow += recToShowPageSize;
+    for ( ; i < recToShow && i < recPerPage; i++) {
+       var element = document.getElementById(recIDs[i]);
+       if (element)
+           element.style.display = '';
+    }
+    if (i == recPerPage) {
+       var element = document.getElementById('recdiv_END');
+       if (element)
+           element.style.display = 'none';
+    }
+}
+
 function my_onshow(data) {
     totalRec = data.merged;
     // move it out
@@ -146,28 +165,43 @@ function my_onshow(data) {
     drawPager(pager);
 
     var results = document.getElementById("results");
-  
+    
     var html = [];
     if (data.hits == undefined) 
-       return ; 
+       return ;
+    var style = '';
     for (var i = 0; i < data.hits.length; i++) {
         var hit = data.hits[i];
-             html.push('<li id="recdiv_'+hit.recid+'" >'
-           /* +'<span>'+ (i + 1 + recPerPage * (curPage - 1)) +'. </span>' */
-            +'<a href="#" id="rec_'+hit.recid
-            +'" onclick="showDetails(this.id);return false;">' 
-            + hit["md-title"] +'</a> '); 
-             if (hit["md-title-responsibility"] !== undefined) {
+       var recID = "recdiv_" + hit.recid; 
+       //var recID = "recdiv_" + i; 
+       recIDs[i] = recID;
+       if (i == recToShow)
+           style = ' style="display:none" ';
+       html.push('<li id="' + recID + '" ' + style +  '>' 
+                 +'<a href="#" id="rec_'+hit.recid
+                 +'" onclick="showDetails(this.id);return false;">' 
+                 + hit["md-title"] +'</a> '); 
+       if (hit["md-title-remainder"] !== undefined) {
+           html.push('<a href="#">' + hit["md-title-remainder"] + ' </a> ');
+       }
+       if (hit["md-author"] != undefined) {
+           html.push('<a href="#">'+hit["md-author"]+'</a> ');
+       }
+       else if (hit["md-title-responsibility"] !== undefined) {
            html.push('<a href="#">'+hit["md-title-responsibility"]+'</a> ');
-             if (hit["md-title-remainder"] !== undefined) {
-               html.push('<a href="#">' + hit["md-title-remainder"] + ' </a> ');
-             }
-       }
+       }
         if (hit.recid == curDetRecId) {
             html.push(renderDetails_iphone(curDetRecData));
         }
-       html.push('</div>');
+       html.push('</li>');
+    }
+    // set up "More..." if needed. 
+    style = 'display:none';
+    if (recToShow < recPerPage) {
+       style = 'display:block';
     }
+    html.push('<li id="recdiv_END" style="' + style + '"><a onclick="showMoreRecords()">More...</a></li>');     
+
     replaceHtml(results, html.join(''));
 }
 
@@ -260,7 +294,7 @@ function my_onterm(data) {
     termlists.push('<ul>');
     termlists.push('<li><a href="#" onclick="limitOrResetQuery(\'reset_au\',\'All\');return false;">All<a></li>');
     for (var i = 0; i < data.author.length && i < AuthorMax; i++ ) {
-        termlists.push('<li><a href="#" onclick="limitQuery(\'au\', \'' + data.author[i].name +'\');return false;">' 
+        termlists.push('<li><a href="#" onclick="limitOrResetQuery(\'au\', \'' + data.author[i].name +'\');return false;">' 
                             + data.author[i].name 
                             + '  (' 
                             + data.author[i].freq 
@@ -404,19 +438,25 @@ function resetPage()
     totalRec = 0;
 }
 
+function getFacets() {
+    var result = "";
+    for (var key in querys_server) {
+       if (result.length > 0)
+           result += ","
+       result += querys_server[key];
+    }
+    return result;
+}
+
 function triggerSearch ()
 {
-    my_paz.search(document.search.query.value, recPerPage, curSort, curFilter
-
-/*
-  undefined,
-
+    // Restore to initial page size
+    recToShow = recToShowPageSize;
+    my_paz.search(document.search.query.value, recPerPage, curSort, curFilter, undefined,
        {
           "limit" : getFacets() 
        }
-*/
        );
-
 }
 
 function loadSelect ()
@@ -438,11 +478,17 @@ function limitQuery(field, value)
 // limit the query after clicking the facet
 function limitQueryServer(field, value)
 {
-  var newQuery = field + '="' + value + '"';
-    if (querys_server[field] == '') 
-       querys_server[field] = newQuery;
+    // Check for client field usage
+    var fieldname = query_client_server[field];
+    if (!fieldname) 
+       fieldname = field;      
+    
+    var newQuery = fieldname + '=' + value.replace(",", "\\,").replace("|", "\\,");
+    // Does it already exists?
+    if (querys_server[fieldname]) 
+       querys_server[fieldname] += "," + newQuery;
     else
-       querys_server[field] += "," + newQuery;
+       querys_server[fieldname] = newQuery;
 //  document.search.query.value += newQuery;
   onFormSubmitEventHandler();
   showhide("recordview");
@@ -482,7 +528,7 @@ function limitOrResetQueryServer (field, value, selected) {
        var fieldname = query_client_server[clientname];
        if (!fieldname) 
            fieldname = clientname;     
-       querys_server[fieldname] = '';
+       delete querys_server[fieldname];
        onFormSubmitEventHandler();
        showhide("recordview");
     }
@@ -656,8 +702,8 @@ function renderDetails(data, marker)
        if (data["md-title-remainder"] !== undefined) {
              details += ' : <span>' + data["md-title-remainder"] + ' </span>';
        }
-       if (data["md-title-responsibility"] !== undefined) {
-             details += ' <span><i>'+ data["md-title-responsibility"] +'</i></span>';
+       if (data["md-author"] !== undefined) {
+             details += ' <span><i>'+ data["md-auhtor"] +'</i></span>';
        }
          details += '</td></tr>';
     }
@@ -714,7 +760,9 @@ function renderDetails_iphone(data, marker)
         if (data["md-title-remainder"] !== undefined) {
              details += ' ' + data["md-title-remainder"] + ' ';
         }
-        if (data["md-title-responsibility"] !== undefined) {
+        if (data["md-author"] !== undefined) {
+             details += '<i>'+ data["md-author"] +'</i>';
+        } else if (data["md-title-responsibility"] !== undefined) {
              details += '<i>'+ data["md-title-responsibility"] +'</i>';
         }
         details += '</big>'