From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 15 Nov 2011 10:27:02 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.6~13^2~7
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=ee0c5796c67648c25249bf34c035d512f98e87b4;p=pazpar2-moved-to-github.git

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

Conflicts:
	www/iphone/example_client.js

Fix: added md-author in branch. Added recIDs on head.
---

ee0c5796c67648c25249bf34c035d512f98e87b4
diff --cc .cproject
index 370e803,370e803..6fed192
--- a/.cproject
+++ b/.cproject
@@@ -43,6 -43,6 +43,7 @@@
  								<option id="gnu.c.compiler.macosx.exe.debug.option.debugging.level.88106198" name="Debug Level" superClass="gnu.c.compiler.macosx.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
  								<option id="gnu.c.compiler.option.include.paths.16758435" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
  									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/yaz/include}&quot;"/>
++									<listOptionValue builtIn="false" value="/usr/local/include"/>
  								</option>
  								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1159745856" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
  							</tool>
diff --cc www/iphone/example_client.js
index ea74e67,a336f8e..3edabac
--- a/www/iphone/example_client.js
+++ b/www/iphone/example_client.js
@@@ -142,26 -165,28 +165,31 @@@ 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-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> ');
-   	      }
-       	}
+ 	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-responsibility"] !== undefined) {
++	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));
          }