[open-ils-commits] r1311 - in servres/trunk/conifer: . syrup syrup/views (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2011-04-02 21:52:47 -0400 (Sat, 02 Apr 2011)
New Revision: 1311

Removed:
   servres/trunk/conifer/mita-missing
Modified:
   servres/trunk/conifer/syrup/urls.py
   servres/trunk/conifer/syrup/views/general.py
Log:
cleanup

Deleted: servres/trunk/conifer/mita-missing
===================================================================
--- servres/trunk/conifer/mita-missing	2011-04-03 01:30:48 UTC (rev 1310)
+++ servres/trunk/conifer/mita-missing	2011-04-03 01:52:47 UTC (rev 1311)
@@ -1,33 +0,0 @@
-24-227 riley
-24-326 riley
-24-351 walsh
-26-100 - missing some sections -- no, they are all in "Beatty"
-28-245 not taught this term
-29-385 dolbec
-32-247 mccarthy
-32-331 magill
-32-427 reynolds
-38-321 falconer
-41-231 clayton?
-43-249 poole
-45-213 no such list...
-45-221 no such list...
-48-332 gannage 
-54-105 soni-sinha
-59-141 who wants it (Ghumman or Hayward)? which list to reuse (Dutton or Dias)?
-59-230 dutton
-59-232 dutton is teaching, but which list ot reuse (Green? Eichorn?)
-59-261 boffa
-59-263 boffa
-61-213 simpson
-61-246 simpson
-62-194 caron et al
-62-380 barron
-70-462 not taught this term
-71-383 Adeniyi-Taiwo
-71-448 marcotte 
-75-290 not taught this term
-78-612 cheung
-78-635 not taught this term
-95-230 paraschak
-95-490 milne

Modified: servres/trunk/conifer/syrup/urls.py
===================================================================
--- servres/trunk/conifer/syrup/urls.py	2011-04-03 01:30:48 UTC (rev 1310)
+++ servres/trunk/conifer/syrup/urls.py	2011-04-03 01:52:47 UTC (rev 1311)
@@ -15,7 +15,6 @@
     (r'^browse/$', 'browse'),
     (r'^browse/(?P<browse_option>.*)/$', 'browse'),
     (r'^prefs/$', 'user_prefs'),
-    (r'^z3950test/$', 'z3950_test'),
     #MARK: propose we kill open_sites, we have browse.
     (r'^opensite/$', 'open_sites'),
     (r'^search/$', 'search'),

Modified: servres/trunk/conifer/syrup/views/general.py
===================================================================
--- servres/trunk/conifer/syrup/views/general.py	2011-04-03 01:30:48 UTC (rev 1310)
+++ servres/trunk/conifer/syrup/views/general.py	2011-04-03 01:52:47 UTC (rev 1311)
@@ -52,40 +52,6 @@
         profile.save()
         return HttpResponseRedirect('../')
 
-def z3950_test(request):
-    #z39.50 testing area
-
-
-    styledoc = libxml2.parseFile(HERE('../../static/xslt/test.xsl'))
-    stylexsl = libxslt.parseStylesheetDoc(styledoc)
-
-    #testing JZKitZ3950 - it seems to work, but i have a character set problem
-    #with the returned marc
-    #nope - the problem is weak mapping with the limited solr test set
-    #i think this can be sorted out
-
-    #conn = zoom.Connection ('z3950.loc.gov', 7090)
-    conn = zoom.Connection ('zed.concat.ca', 210)
-    print("connecting...")
-    conn.databaseName = 'OWA'
-    conn.preferredRecordSyntax = 'XML'
-    # conn.preferredRecordSyntax = 'USMARC'
-    query = zoom.Query ('CCL', 'ti="agar"')
-    res = conn.search (query)
-    collector = []
-    # if we wanted to get into funkiness
-    m = zmarc.MARC8_to_Unicode ()
-    for r in res:
-        #print(type(r.data))
-        #print(type(m.translate(r.data)))
-	zhit = str("<?xml version=\"1.0\"?>") + (m.translate(r.data))
-	#doc = libxml2.parseDoc(zhit)
-	#print(stylexsl.applyStylesheet(doc, None))
-
-    conn.close ()
-    res_str = "" . join(collector)
-    return g.render('z3950_test.xhtml', res_str=res_str)
-
 def browse(request, browse_option=''):
     #the defaults should be moved into a config file or something...
     page_num = int(request.GET.get('page', 1))