[open-ils-commits] r1146 - in servres/trunk/conifer: . libsystems syrup/views templates/components (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2010-12-29 10:42:57 -0500 (Wed, 29 Dec 2010)
New Revision: 1146

Modified:
   servres/trunk/conifer/TODO
   servres/trunk/conifer/libsystems/marcxml.py
   servres/trunk/conifer/syrup/views/items.py
   servres/trunk/conifer/templates/components/site.xhtml
Log:
Fix marcxml import problems. No longer show Publisher on item-list view.

But do show the item source (journal title) if available.

Modified: servres/trunk/conifer/TODO
===================================================================
--- servres/trunk/conifer/TODO	2010-12-29 15:42:54 UTC (rev 1145)
+++ servres/trunk/conifer/TODO	2010-12-29 15:42:57 UTC (rev 1146)
@@ -1,6 +1,6 @@
 NEW:
 
-* can we clean up the add/edit item code in items.py?
+* how should "join this site" be managed?
 
 * write up some documentation
 
@@ -19,6 +19,8 @@
 
 MAYBE:
 
+* refactor the add/edit item code in items.py
+
 * refactor fuzzyFinder into a Genshi component.
 
 * set up a proper issue-tracker?

Modified: servres/trunk/conifer/libsystems/marcxml.py
===================================================================
--- servres/trunk/conifer/libsystems/marcxml.py	2010-12-29 15:42:54 UTC (rev 1145)
+++ servres/trunk/conifer/libsystems/marcxml.py	2010-12-29 15:42:57 UTC (rev 1146)
@@ -73,9 +73,9 @@
         if value:
             out[dc] = value
 
-    pub = [v.strip() for k,v in sorted(dct.items()) if k.startswith('260')]
+    pub = [strip_punct(v) for k,v in sorted(dct.items()) if k in ('260a', '260b')]
     if pub:
-        out['dc:publisher'] = strip_punct(' '.join(pub))
+        out['dc:publisher'] = ': '.join(pub)
 
     title = [v.strip() for k,v in sorted(dct.items()) if k in ('245a', '245b')]
     if title:

Modified: servres/trunk/conifer/syrup/views/items.py
===================================================================
--- servres/trunk/conifer/syrup/views/items.py	2010-12-29 15:42:54 UTC (rev 1145)
+++ servres/trunk/conifer/syrup/views/items.py	2010-12-29 15:42:57 UTC (rev 1146)
@@ -269,7 +269,7 @@
             pubdate = dublin.get('dc:date')
             m = re.search('([0-9]+)', pubdate)
             if m:
-                pubdate = pubdate.group(1)
+                pubdate = m.group(1)
         except:
             pubdate = ''
 

Modified: servres/trunk/conifer/templates/components/site.xhtml
===================================================================
--- servres/trunk/conifer/templates/components/site.xhtml	2010-12-29 15:42:54 UTC (rev 1145)
+++ servres/trunk/conifer/templates/components/site.xhtml	2010-12-29 15:42:57 UTC (rev 1146)
@@ -57,9 +57,6 @@
 		<span py:if="item.published">(${item.published}).</span>
 		<span py:if="item.source_title"><i>${item.source_title}.</i></span>
 		<span py:if="item.volume"><i>${item.volume}</i>(${item.issue}), ${item.pages}.</span>
-		<span py:if="not item.source_title">
-		  <span py:if="item.publisher">${item.publisher}.</span>
-		</span>
       </div>
       <div class="forbidden_notice" py:if="forbidden">Awaiting copyright clearance: Not available to students.</div>
 	  <div>