Basic full record display logic.

Todo: Close non-active views, update view periodically.

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 3587f3c..7131b7b 100644 (file)
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -21,6 +21,12 @@
        <xsl:value-of select="marc:datafield[@tag='245']/marc:subfield[@code='b']"/>
       </pz:metadata>
 
+      <xsl:for-each select="marc:datafield[@tag='020']">
+        <pz:metadata type="isbn">
+         <xsl:value-of select="marc:subfield[@code='a']"/>
+       </pz:metadata>
+      </xsl:for-each>
+
       <xsl:for-each select="marc:datafield[@tag='260']">
         <pz:metadata type="date">
          <xsl:value-of select="marc:subfield[@code='c']"/>

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 04aa241..afbfd1b 100644 (file)
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -7,6 +7,7 @@
 
   <service>
     <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6"/>
+    <metadata name="isbn" merge="unique"/>
     <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"/>
     <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2"/>
     <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
@@ -20,7 +21,7 @@
 
 <retrievalprofile>
   <requestsyntax>marc21</requestsyntax>
-  <nativesyntax name="iso2709" format="marc21" encoding="marc-8" mapto="marcxml"/>
+  <nativesyntax name="iso2709" format="marc21" encoding="marc8s" mapto="marcxml"/>
   <map type="xslt" stylesheet="marc21.xsl"/>
 </retrievalprofile>
 

diff --git a/src/pazpar2.c b/src/pazpar2.c
index c24ec00..1f23d6c 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.34 2007-01-15 20:01:53 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.35 2007-01-16 03:38:49 quinn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -515,7 +515,6 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
     mergekey_norm = nmem_strdup(se->nmem, (char*) mergekey);
     xmlFree(mergekey);
     normalize_mergekey(mergekey_norm, 0);
-    yaz_log(YLOG_LOG, "MK: '%s'", mergekey_norm);
 
     cluster = reclist_insert(se->reclist, res, mergekey_norm, &se->total_merged);
     if (!cluster)
@@ -599,7 +598,7 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
             {
                 struct record_metadata *mnode;
                 for (mnode = *wheretoput; mnode; mnode = mnode->next)
-                    if (!strcmp(mnode->data.text, mnode->data.text))
+                    if (!strcmp(mnode->data.text, newm->data.text))
                         break;
                 if (!mnode)
                 {

diff --git a/www/demo/search.js b/www/demo/search.js
index 6eb3ccb..edf3c00 100644 (file)
--- a/www/demo/search.js
+++ b/www/demo/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.25 2007-01-15 22:05:37 quinn Exp $
+/* $Id: search.js,v 1.26 2007-01-16 03:38:50 quinn Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -10,6 +10,7 @@ var xsearch;
 var xshow;
 var xstat;
 var xtermlist;
+var xfetchDetails;
 var session = false;
 var targetsloaded = false;
 var shown;
@@ -213,6 +214,91 @@ function set_sort(sort)
     set_sort_opt(t, 'title:1', 'Title');
 }
 
+function displayname(name)
+{
+    if (name == 'md-author')
+       return 'Author';
+    else if (name == 'md-subject')
+       return 'Subject';
+    else if (name == 'md-date')
+       return 'Date';
+    else if (name == 'md-isbn')
+       return 'ISBN';
+    else if (name == 'md-publisher')
+       return 'Publisher';
+    else
+       return name;
+}
+
+function show_details()
+{
+    if (xfetchDetails.readyState != 4)
+       return;
+    var xml = xfetchDetails.responseXML;
+    var error = xml.getElementsByTagName("error");
+    if (error[0])
+    {
+       var msg = error[0].childNodes[0].nodeValue;
+       alert(msg);
+       location = "?";
+       return;
+    }
+
+    // This is some ugly display code. Replace with your own ting o'beauty
+
+    var idn = xml.getElementsByTagName('recid');
+    if (!idn[0])
+       return;
+    var id = idn[0].childNodes[0].nodeValue;
+
+    var body = document.getElementById('rec_' + id);
+    if (!body)
+       return;
+    clear_cell(body);
+    //body.appendChild(document.createElement('br'));
+    var nodes = xml.childNodes[0].childNodes;
+    var i;
+    var table = document.createElement('table');
+    table.setAttribute('cellpadding', 2);
+    for (i = 0; i < nodes.length; i++)
+    {
+       if (nodes[i].nodeType != 1)
+           continue;
+       var name = nodes[i].nodeName;
+       if (name == 'recid' || name == 'md-title')
+           continue;
+       name = displayname(name);
+       var value = nodes[i].childNodes[0].nodeValue;
+       var lbl = create_element('b', name );
+       var lbln = document.createElement('td');
+       lbln.setAttribute('width', 70);
+       lbln.appendChild(lbl);
+       var val = create_element('td', value);
+       var tr = document.createElement('tr');
+       tr.appendChild(lbln);
+       tr.appendChild(val);
+       table.appendChild(tr);
+    }
+    body.appendChild(table);
+    body.style.display = 'inline';
+}
+
+function fetch_details(id)
+{
+    var node = document.getElementById('rec_' + id);
+    if (node && node.style.display == 'inline')
+    {
+       node.style.display = 'none';
+       return;
+    }
+    if (!session)
+       return;
+    var url = "search.pz2?session=" + session +
+        "&command=record" +
+       "&id=" + id;
+    SendXmlHttpObject(xfetchDetails = GetXmlHttpObject(), url, show_details);
+}
+
 function show_records()
 {
     if (xshow.readyState != 4)
@@ -262,6 +348,7 @@ function show_records()
            var author = '';
            var cn = hits[i].getElementsByTagName("count");
            var count = 1;
+           var idn = hits[i].getElementsByTagName("recid");
 
            if (tn[0]) {
                 title = tn[0].childNodes[0].nodeValue;
@@ -272,12 +359,14 @@ function show_records()
                    author = an[0].childNodes[0].nodeValue;
            if (cn[0])
                count = Number(cn[0].childNodes[0].nodeValue);
+           var id = idn[0].childNodes[0].nodeValue;
             
            var record_div = document.createElement('div');
            record_div.className = 'record';
 
             var record_cell = create_element('a', title);
             record_cell.setAttribute('href', '#');
+           record_cell.setAttribute('onclick', 'fetch_details(' + id + '); return false');
             record_div.appendChild(record_cell);
            if (author)
            {
@@ -287,6 +376,12 @@ function show_records()
            if (count > 1)
                record_div.appendChild(document.createTextNode(
                        ' (' + count + ')'));
+           var det_div = document.createElement('div');
+           det_div.style.display = 'none';
+           det_div.setAttribute('id', 'rec_' + id);
+           det_div.appendChild(document.createElement('br'));
+           det_div.appendChild(document.createTextNode('Hugo'));
+           record_div.appendChild(det_div);
            record_container.appendChild(record_div);
        }