X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=www%2Fiphone%2Fexample_client.js;h=ea0de77734e73cad544c40f58c2910b02a597d4d;hb=47eccb020f44855ef54a68d424b2d56db8cb8ede;hp=44b2c5712f4234c7aed4722ccc838833115128a9;hpb=39dbd2f88a17311c8d7ea06363c8e766419c0731;p=pazpar2-moved-to-github.git

diff --git a/www/iphone/example_client.js b/www/iphone/example_client.js
index 44b2c57..ea0de77 100644
--- a/www/iphone/example_client.js
+++ b/www/iphone/example_client.js
@@ -14,13 +14,15 @@ var querys_server = {};
 var useLimit = 1;
 // Fail to get JSON working stabil.
 var showResponseType = 'xml';
+
+var imageHelper = new ImageHelper();
+
 if (document.location.hash == '#pazpar2' || document.location.search.match("useproxy=false")) {
     usesessions = true;
     pazpar2path = '/pazpar2/search.pz2';
     showResponseType = 'xml';
 }
 
-
 my_paz = new pz2( { "onshow": my_onshow,
 //                    "showtime": 2000,            //each timer (show, stat, term, bytarget) can be specified this way
                     "pazpar2path": pazpar2path,
@@ -31,10 +33,12 @@ my_paz = new pz2( { "onshow": my_onshow,
                     "onbytarget": null,
 		    "usesessions" : usesessions,
                     "showResponseType": showResponseType,
-                    "onrecord": my_onrecord } );
+                    "onrecord": my_onrecord,
+		    "errorhandler" : my_onerror} 
+);
 // some state vars
 var curPage = 1;
-var recPerPage = 100;
+var recPerPage = 10;
 var recToShowPageSize = 20;
 var recToShow = recToShowPageSize;
 var recIDs = {};
@@ -52,6 +56,33 @@ var tab = "recordview";
 var triedPass = "";
 var triedUser = "";
 
+//
+// pz2.js event handlers:
+//
+function my_onerror(error) {
+    switch(error.code) {
+        // No targets!
+    case "8": alert("No resources were selected for the search"); break;
+    	// target not configured, this is a pazpar2 bug
+        // but for now simply research
+    case "9": 
+	triggerSearch(); 
+	break;
+	
+	// Already blocked 
+    case "13": 
+	// ignore
+	break
+        // authentication
+    case "100" : 
+	auth.check(loggedIn, login);
+	break;
+    default: 
+	alert("Unhandled error: " + error.code);
+	throw error; // display error in JavaScript console
+    }
+}
+
 function loginFormSubmit() {
     triedUser = document.loginForm.username.value;
     triedPass = document.loginForm.password.value;
@@ -121,7 +152,7 @@ function logInOrOut() {
 }
 function loggedIn() {
     var login = document.getElementById("login");
-    login.innerHTML = 'Logout(' + auth.displayName + ')';
+    login.innerHTML = 'Logout';
     document.getElementById("log").innerHTML = login.innerHTML;
 }
 
@@ -153,16 +184,45 @@ function showMoreRecords() {
     }
 }
 
+function hideRecords() {
+    for ( var i = 0; i < recToShow; i++) {
+	var element = document.getElementById(recIDs[i]);
+	if (element && recIDs != curDetRecId)
+	    element.style.display = 'none';
+    }
+    var element = document.getElementById('recdiv_END');
+    if (element)
+	element.style.display = 'none';
+}
+
+function showRecords() {
+    for (var i = 0 ; i < recToShow && i < recPerPage; i++) {
+	var element = document.getElementById(recIDs[i]);
+	if (element)
+	    element.style.display = '';
+    }
+    var element = document.getElementById('recdiv_END');
+    if (element) {
+	if (i == recPerPage)
+	    element.style.display = 'none';
+	else
+	    element.style.display = '';
+    }
+}
+
+
+
+
 function my_onshow(data) {
     totalRec = data.merged;
     // move it out
     var pager = document.getElementById("pager");
     pager.innerHTML = "";
-    pager.innerHTML +='<hr/><div style="float: right">Displaying: ' 
+    drawPager(pager);
+    pager.innerHTML +='<div class="status">Displaying: ' 
                     + (data.start + 1) + ' to ' + (data.start + data.num) +
                      ' of ' + data.merged + ' (found: ' 
                      + data.total + ')</div>';
-    drawPager(pager);
 
     var results = document.getElementById("results");
     
@@ -172,33 +232,75 @@ function my_onshow(data) {
     var style = '';
     for (var i = 0; i < data.hits.length; i++) {
         var hit = data.hits[i];
-	var recID = "recdiv_" + hit.recid; 
-	//var recID = "recdiv_" + i; 
-	recIDs[i] = recID;
+	var recDivID = "recdiv_" + hit.recid; 
+	recIDs[i] = recDivID;
+	var lines = 0;
 	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-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> ');
-  	    }
-      	}
+	html.push('<li class="img" id="' + recDivID + '" ' + style +  '>' );
+	html.push('<a class="img" href="#' + i + '" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;" >');
+	if (1) {
+            var useThumbnails = hit["md-use_thumbnails"];
+            var thumburls = hit["md-thumburl"];
+            if (thumburls && (useThumbnails == undefined || useThumbnails == "1")) {
+		var thumbnailtag = imageHelper.getImageTagByRecId(hit.recid,"md-thumburl", 60, "S"); 
+		html.push(thumbnailtag);
+	    } else { 
+		if (hit["md-isbn"] != undefined) { 
+		    var coverimagetag = imageHelper.getImageTagByRecId(hit.recid, "md-isbn", 60, "S"); 
+		    if (coverimagetag.length>0) { 
+                        html.push(coverimagetag);
+		    } else { 
+			html.push("&nbsp;");
+		    }
+		}
+	    }
+	} 
+	html.push("</a>");
+	html.push('<a href="#" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;">');
+	html.push(hit["md-title"]); 
+	html.push("</a>");
+
+	if (hit["md-title-remainder"] != undefined) {
+	    html.push('<a href="#" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;">');
+	    html.push(hit["md-title-remainder"]);
+	    html.push("</a>");
+	    lines++;
+	}
+	if (hit["md-author"] != undefined) {
+	    html.push('<a href="#" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;">');
+	    html.push(hit["md-author"]);
+	    html.push("</a>");
+	    lines++;
+	}
+	else if (hit["md-title-responsibility"] != undefined) {
+	    html.push('<a href="#" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;">');
+    	    html.push(hit["md-title-responsibility"]);
+	    html.push("</a>");
+	    lines++;
+	}
+	for (var idx = lines ; idx < 2 ; idx++) {
+	    html.push('<a href="#" id="rec_'+hit.recid + '" onclick="showDetails(this.id);return false;">');
+	    html.push("&nbsp;");	    
+	    html.push("</a>");
+	}
+/*
         if (hit.recid == curDetRecId) {
             html.push(renderDetails_iphone(curDetRecData));
         }
+*/
       	html.push('</li>');
     }
+    if (data.activeclients == 0)
+	document.getElementById("loading").style.display = 'none';
+/*
     // 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>');     
-
+    html.push('<li class="img" id="recdiv_END" style="' + style + '"><a onclick="showMoreRecords()">More...</a></li>');     
+*/
     replaceHtml(results, html.join(''));
 }
 
@@ -214,13 +316,15 @@ function my_onstat(data) {
                         + '/' + data.hits + ' :.</span>';
 }
 
-function showhide(newtab) {
+function showhide(newtab, hash) {
     var showtermlist = false;
     if (newtab != null)
 	tab = newtab;
     
     if (tab == "recordview") {
 	document.getElementById("recordview").style.display = '';
+	if (hash != undefined)
+	    document.location.hash = hash;
     }
     else 
 	document.getElementById("recordview").style.display = 'none';
@@ -246,6 +350,16 @@ function showhide(newtab) {
     else
 	document.getElementById("term_authors").style.display = 'none';
 
+    if (tab == "detailview") {
+	document.getElementById("detailview").style.display = '';
+    }
+    else {
+	document.getElementById("detailview").style.display = 'none';
+	var element = document.getElementById("rec_" + curDetRecId);
+	if (element != undefined)
+	    element.scrollIntoView();
+
+    }
     if (showtermlist == false) 
 	document.getElementById("termlist").style.display = 'none';
     else 
@@ -265,10 +379,10 @@ function my_onterm(data) {
     
     termlists.push('<div id="term_xtargets" >');
     termlists.push('<h4 class="termtitle">Sources</h4>');
-    termlists.push('<ul>');
-    termlists.push('<li><a href="#" target_id="reset_xt" onclick="limitOrResetTarget(\'reset_xt\',\'All\');return false;">All</a></li>');
+    termlists.push('<ul class="termlist">');
+    termlists.push('<li> <a href="#" target_id="reset_xt" onclick="limitOrResetTarget(\'reset_xt\',\'All\');return false;">All</a></li>');
     for (var i = 0; i < data.xtargets.length && i < SourceMax; i++ ) {
-        termlists.push('<li><a href="#" target_id='+data.xtargets[i].id
+        termlists.push('<li class="termlist"><a href="#" target_id='+data.xtargets[i].id
             + ' onclick="limitOrResetTarget(this.getAttribute(\'target_id\'), \'' + data.xtargets[i].name + '\');return false;">' 
 	    + data.xtargets[i].name + ' (' + data.xtargets[i].freq + ')</a></li>');
     }
@@ -277,7 +391,7 @@ function my_onterm(data) {
      
     termlists.push('<div id="term_subjects" >');
     termlists.push('<h4>Subjects</h4>');
-    termlists.push('<ul>');
+    termlists.push('<ul class="termlist">');
     termlists.push('<li><a href="#" target_id="reset_su" onclick="limitOrResetQuery(\'reset_su\',\'All\');return false;">All</a></li>');
     for (var i = 0; i < data.subject.length && i < SubjectMax; i++ ) {
         termlists.push('<li><a href="#" onclick="limitOrResetQuery(\'su\', \'' + data.subject[i].name + '\');return false;">' 
@@ -288,8 +402,8 @@ function my_onterm(data) {
             
     termlists.push('<div id="term_authors" >');
     termlists.push('<h4 class="termtitle">Authors</h4>');
-    termlists.push('<ul>');
-    termlists.push('<li><a href="#" onclick="limitOrResetQuery(\'reset_au\',\'All\');return false;">All<a></li>');
+    termlists.push('<ul class="termlist">');
+    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="limitOrResetQuery(\'au\', \'' + data.author[i].name +'\');return false;">' 
                             + data.author[i].name 
@@ -340,15 +454,18 @@ function getAuthors() {
 }
 
 function my_onrecord(data) {
+
     // FIXME: record is async!!
     clearTimeout(my_paz.recordTimer);
     // in case on_show was faster to redraw element
-    var detRecordDiv = document.getElementById('det_'+data.recid);
-    if (detRecordDiv) return;
+    var detailRecordDiv = document.getElementById('detailrecord');
+    if (!detailRecordDiv) 
+	return;
     curDetRecData = data;
-    var recordDiv = document.getElementById('recdiv_'+curDetRecData.recid);
     var html = renderDetails_iphone(curDetRecData);
-    recordDiv.innerHTML += html;
+    detailRecordDiv.innerHTML = html;
+    showhide('detailview');
+    document.getElementById("loading").style.display = 'none';
 }
 
 function my_onrecord_iphone(data) {
@@ -388,6 +505,12 @@ function domReady ()
     	applicationMode(true);
     else
     	applicationMode(false);
+
+    var params = parseQueryString(window.location.search);
+    if (params.query) {
+	document.search.query.value = params.query;
+	onFormSubmitEventHandler();
+    }
 }
  
 function applicationMode(newmode) 
@@ -449,11 +572,13 @@ function triggerSearch ()
 {
     // Restore to initial page size
     recToShow = recToShowPageSize;
+    document.getElementById("loading").style.display = 'inline';
     my_paz.search(document.search.query.value, recPerPage, curSort, curFilter, undefined,
 	{
     	   "limit" : getFacets() 
 	}
 	);
+    showhide("recordview");
 }
 
 function loadSelect ()
@@ -544,7 +669,6 @@ function limitTarget (id, name)
     resetPage();
     loadSelect();
     triggerSearch();
-    showhide("recordview");
     return false;
 }
 
@@ -569,7 +693,7 @@ function limitOrResetTarget(id, name) {
 function drawPager (pagerDiv)
 {
     //client indexes pages from 1 but pz2 from 0
-    var onsides = 6;
+    var onsides = 2;
     var pages = Math.ceil(totalRec / recPerPage);
     
     var firstClkbl = ( curPage - onsides > 0 ) 
@@ -580,10 +704,10 @@ function drawPager (pagerDiv)
         ? firstClkbl + 2*onsides
         : pages;
 
-    var prev = '<span id="prev">&#60;&#60; Prev</span><b> | </b>';
+    var prev = '<span id="prev">Prev</span><b> | </b>';
     if (curPage > 1)
         var prev = '<a href="#" id="prev" onclick="pagerPrev();">'
-        +'&#60;&#60; Prev</a><b> | </b>';
+        +'Prev</a><b> | </b>';
 
     var middle = '';
     for(var i = firstClkbl; i <= lastClkbl; i++) {
@@ -595,10 +719,10 @@ function drawPager (pagerDiv)
             + numLabel + ' </a>';
     }
     
-    var next = '<b> | </b><span id="next">Next &#62;&#62;</span>';
+    var next = '<b> | </b><span id="next">Next</span>';
     if (pages - curPage > 0)
     var next = '<b> | </b><a href="#" id="next" onclick="pagerNext()">'
-        +'Next &#62;&#62;</a>';
+        +'Next</a>';
 
     predots = '';
     if (firstClkbl > 1)
@@ -608,8 +732,8 @@ function drawPager (pagerDiv)
     if (lastClkbl < pages)
         postdots = '...';
 
-    pagerDiv.innerHTML += '<div style="float: none">' 
-        + prev + predots + middle + postdots + next + '</div><hr/>';
+    pagerDiv.innerHTML += '<div class="pager">' 
+        + prev + predots + middle + postdots + next + '</div>';
 }
 
 function showPage (pageNum)
@@ -659,20 +783,13 @@ function showDetails (prefixRecId) {
     var oldRecId = curDetRecId;
     curDetRecId = recId;
     
-    // remove current detailed view if any
-    var detRecordDiv = document.getElementById('det_'+oldRecId);
-    //alert("oldRecId: " + oldRecId + " " + detRecordDiv != null); 
-    // lovin DOM!
-    if (detRecordDiv)
-      detRecordDiv.parentNode.removeChild(detRecordDiv);
-
-    // if the same clicked, just hide
+    // if the same clicked, just show it again
     if (recId == oldRecId) {
-        curDetRecId = '';
-        curDetRecData = null;
+	showhide('detailview');
         return;
     }
     // request the record
+    document.getElementById("loading").style.display = 'inline';
     my_paz.record(recId);
 }
 
@@ -696,13 +813,13 @@ function renderDetails(data, marker)
     if (marker) details += '<tr><td>'+ marker + '</td></tr>';
     if (data["md-title"] != undefined) {
         details += '<tr><td><b>Title</b></td><td><b>:</b> '+data["md-title"];
-  	if (data["md-title-remainder"] !== undefined) {
+  	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>';
+ 	details += '</td></tr>';
     }
     if (data["md-date"] != undefined)
         details += '<tr><td><b>Date</b></td><td><b>:</b> ' + data["md-date"] + '</td></tr>';
@@ -718,15 +835,51 @@ function renderDetails(data, marker)
     return details;
 }
 
-function renderLine(title, value) {
+var default_tag = 'big';
+function renderLine(title, value, tag) {
+    if (tag == undefined)
+	tag = default_tag;
     if (value != undefined)
-        return '<li><h3>' + title + '</h3> <big>' + value + '</big></li>';
+        return '<li><h3>' + title + '</h3><' + tag + '>' + value + '</' + tag + '></li>';
     return '';
 }
 
+function renderLines(title, values, name, tag) {
+    if (tag == undefined)
+	tag = default_tag;
+    var result = "";
+    if (values != undefined && values.length)
+	for (var idx = 0 ; idx < values.length ; idx++)
+	    if (values[idx][name] != undefined )
+		result += values[idx][name] + ' ';
+    if (result != "") 
+	result = '<li><h3>' + title + '</h3><' + tag + '>' + result + '</' + tag + '></li>';
+    return result;
+}
+
+// Values is a array of locations. 
+
+function renderLinesURL(title, values, name, url, tag) {
+    if (tag == undefined)
+	tag = default_tag;
+    var result = "";
+    result = '<li><h3>' + title + '</h3><' + tag + ' style="display: inline-block;">';
+    if (values != undefined && values.length) {
+	for (var idx = 0 ; idx < values.length ; idx++) {
+	    var url = choose_url(values[idx], auth.proxyUrl);
+	    if (url != null)
+		result += '<a target="_blank" href="' + url + '">' + values[idx][name] + '</a><br>';
+	    else
+		result += values[idx][name] + '<br>';
+	}
+    }
+    result += '</' + tag + '></li>';
+    return result;
+}
+
 function renderLineURL(title, URL, display) {
     if (URL != undefined)
-    	return '<li><h3>' + title + '</h3> <a href="' + URL + '" target="_blank">' + display + '</a></li>';
+    	return '<li><h3>' + title + '</h3><a href="' + URL + '" target="_blank">' + display + '</a></li>';
     return '';
 }
 
@@ -736,6 +889,15 @@ function renderLineEmail(dtitle, email, display) {
     return '';
 }
 
+
+function find_prioritized(values) {
+    for (var index = 0; index < values.length; index++) {
+	if (values[index] != undefined)
+	    return values[index];
+    }
+    return undefined;
+}
+
 function renderDetails_iphone(data, marker)
 {
 	//return renderDetails(data,marker);
@@ -743,34 +905,41 @@ function renderDetails_iphone(data, marker)
     if (!data) 
 	return ""; 
     var details = '<div class="details" id="det_'+data.recid+'" >'
-/*
-    details = '<div id="header" id="det_'+data.recid+'">' 
-    	+ '<h1>Detailed Info</h1>' 
-    	+ '<a id="backbutton" href="hidedetail(\'det_' + data.recid + '\')">Back</a>' 
-    	+ '</div>';
-*/
     if (marker) 
     	details += '<h4>'+ marker + '</h4>'; 
-    details += '<ul class="field">';
+    details += '<ul class="field" >';
+
+    var title  = '';
     if (data["md-title"] != undefined) {
-    	details += '<li><h3>Title</h3> <big> ' + data["md-title"];
-        if (data["md-title-remainder"] !== undefined) {
-	      details += ' ' + data["md-title-remainder"] + ' ';
-        }
-        if (data["md-title-responsibility"] !== undefined) {
-	      details += '<i>'+ data["md-title-responsibility"] +'</i>';
+    	title +=  data["md-title"];
+        if (data["md-title-remainder"] != undefined) {
+	    title += '<br><i>' + data["md-title-remainder"] + '</i>';
         }
-        details += '</big>'
-        details += '</li>'
     }
+    details += renderLine('Title', title);
+
+    var author = find_prioritized(
+	[
+	    data["md-author"],
+	    data["md-title-responsibility"]
+	]
+    );
+
+    var coverimagetag = imageHelper.getImageTagByRecId(data.recid, "md-isbn", undefined, "M");
     details 
     	+=renderLine('Date', 	data["md-date"])
     	+ renderLine('Author', 	data["md-author"])
-    	+ renderLineURL('URL', 	data["md-electronic-url"], data["md-electronic-url"])
-    	+ renderLine('Subject', data["location"][0]["md-subject"]);
-    
-    if (data["location"][0]["@name"] != undefined)
-    	details += renderLine('Location', data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")");
+//    	+ renderLineURL('URL', 	data["md-electronic-url"], data["md-electronic-url"])
+    	+ renderLine('Description', 	data["md-description"])
+//    	+ renderLines('Subjects', data["location"], "md-subject")
+    ;
+
+    details += renderLinesURL('Location', data["location"], "@name", "md-url_recipe");
+    details += '<li><a href="#" onclick="showhide(\'recordview\')" style="font-size: 18px;">Back</a></li>';
+    if (coverimagetag.length>0) {
+	details += renderLine('&nbsp;', coverimagetag);
+    }
+
     details += '</ul></div>';
     return details;
 }