Changeset 448:35e7ea6f2368 in documentViewer for documentViewer.py

Timestamp:

Jul 29, 2011, 10:33:17 AM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• documentViewer.py (modified) (9 diffs)

documentViewer.py

@@ -596 +596 @@
     def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets bibliographical info from the index.meta file at path or given by dom"""
-        logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
+        #logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
         
         if docinfo is None:
@@ -608 +608 @@
         docinfo['indexMetaPath']=self.getIndexMetaPath(path);
         
-        logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
+        #logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
         # put in all raw bib fields as dict "bib"
         bib = dom.xpath("//bib/*")
@@ -628 +628 @@
         docinfo['bib_type'] = bibtype
         bibmap=metaData.generateMappingForType(bibtype)
-        logging.debug("documentViewer (getbibinfofromindexmeta) bibmap:"+repr(bibmap))
-        logging.debug("documentViewer (getbibinfofromindexmeta) bibtype:"+repr(bibtype))
+        #logging.debug("documentViewer (getbibinfofromindexmeta) bibmap:"+repr(bibmap))
+        #logging.debug("documentViewer (getbibinfofromindexmeta) bibtype:"+repr(bibtype))
         # if there is no mapping bibmap is empty (mapping sometimes has empty fields)
         if len(bibmap) > 0 and len(bibmap['author'][0]) > 0:
@@ -641 +641 @@
                 docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0])
             except: pass
-            logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
+            #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
             try:
                 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
@@ -686 +686 @@
             except:
                 docinfo['isbn_issn']=''           
+        #logging.debug("I NEED BIBTEX %s"%docinfo)
         return docinfo
     
-     
+    
     def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets name info from the index.meta file at path or given by dom"""
@@ -792 +793 @@
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
+        #docinfo = self.getDownloadfromDocinfoToBibtex(url, docinfo=docinfo, dom=dom)
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
         
@@ -847 +849 @@
         #path ist the path to the images it assumes that the index.meta file is one level higher.
         docinfo = self.getBibinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1)
+        #docinfo = self.getDownloadfromDocinfoToBibtex(pathorig,docinfo=docinfo,cut=cut+1)
         docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1)
         return docinfo
@@ -913 +916 @@
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
         pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
+        
+        pageinfo ['highlightElementPos'] = self.REQUEST.get('highlightElementPos','')
+        pageinfo ['highlightElement'] = self.REQUEST.get('highlightElement','')
+        
+        
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
@@ -929 +937 @@
             pageinfo['tocPN'] = min (tocPages,toc)                    
         pageinfo['searchPN'] =self.REQUEST.get('searchPN','1')
-        pageinfo['sn'] =self.REQUEST.get('sn','')
+        #pageinfo['sn'] =self.REQUEST.get('sn','')
+        pageinfo['s'] =self.REQUEST.get('s','')
         return pageinfo