--- documentViewer/documentViewer.py	2011/01/12 14:10:45	1.165
+++ documentViewer/documentViewer.py	2011/02/18 11:21:46	1.168
@@ -94,7 +94,7 @@ def browserCheck(self):
         if string.find(ie1, "Firefox") >-1:
             nav5= string.split(ie1, "/")[1]
             logging.debug("FIREFOX: %s"%(nav5))
-            bt['versFirefox']=string.split(nav5, ".")[1]                   
+            bt['versFirefox']=nav5[0:3]                   
     except:pass
     #Opera identification
     try:
@@ -230,7 +230,7 @@ class documentViewer(Folder):
     def getTextPage(self, **args):
         """get page"""
         return self.template.fulltextclient.getTextPage(**args)
-
+    
     def getQuery(self, **args):
         """get query in search"""
         return self.template.fulltextclient.getQuery(**args)
@@ -336,7 +336,8 @@ class documentViewer(Folder):
         if (docinfo.get('textURLPath',None)):
             page = self.getTextPage(docinfo=docinfo, pageinfo=pageinfo)
             pageinfo['textPage'] = page
-        pt = getattr(self.template, 'viewer_main')               
+        tt = getattr(self, 'template')   
+        pt = getattr(tt, 'viewer_main')               
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
   
     def generateMarks(self,mk):
@@ -628,7 +629,46 @@ class documentViewer(Folder):
                 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
             except:
                 docinfo['lang']=''
-
+            try:
+                docinfo['city']=getTextFromNode(dom.xpath("//bib/city")[0])
+            except:
+                docinfo['city']=''
+            try:
+                docinfo['number_of_pages']=getTextFromNode(dom.xpath("//bib/number_of_pages")[0])
+            except:
+                docinfo['number_of_pages']=''
+            try:
+                docinfo['series_volume']=getTextFromNode(dom.xpath("//bib/series_volume")[0])
+            except:
+                docinfo['series_volume']=''
+            try:
+                docinfo['number_of_volumes']=getTextFromNode(dom.xpath("//bib/number_of_volumes")[0])
+            except:
+                docinfo['number_of_volumes']=''
+            try:
+                docinfo['translator']=getTextFromNode(dom.xpath("//bib/translator")[0])
+            except:
+                docinfo['translator']=''
+            try:
+                docinfo['edition']=getTextFromNode(dom.xpath("//bib/edition")[0])
+            except:
+                docinfo['edition']=''
+            try:
+                docinfo['series_author']=getTextFromNode(dom.xpath("//bib/series_author")[0])
+            except:
+                docinfo['series_author']=''
+            try:
+                docinfo['publisher']=getTextFromNode(dom.xpath("//bib/publisher")[0])
+            except:
+                docinfo['publisher']=''
+            try:
+                docinfo['series_title']=getTextFromNode(dom.xpath("//bib/series_title")[0])
+            except:
+                docinfo['series_title']=''
+            try:
+                docinfo['isbn_issn']=getTextFromNode(dom.xpath("//bib/isbn_issn")[0])
+            except:
+                docinfo['isbn_issn']=''           
         return docinfo