--- ECHO_content/ECHO_collection.py 2004/06/24 12:23:05 1.129
+++ ECHO_content/ECHO_collection.py 2004/06/25 11:02:16 1.130
@@ -187,7 +187,7 @@ class BrowserCheck:
def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
def updateTextToolNode(tag,value):
- print dom,tag,value
+ #print dom,tag,value
metanode=dom.getElementsByTagName('texttool')[0]
try:
nodeOld=metanode.getElementsByTagName(tag)
@@ -584,11 +584,11 @@ class ECHO_resource(Folder,Persistent):
def getTitle(self):
"""title"""
- return self.title.encode('utf-8')
+ return self.title.decode('utf-8','ignore')
def getLabel(self):
"""title"""
- return self.label.encode('utf-8')
+ return self.label.decode('utf-8','ignore')
def content_html(self):
"""template fuer content"""
@@ -844,6 +844,7 @@ class ECHO_resource(Folder,Persistent):
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
if not hasattr(self,'metaDataHash'):
+
self.copyIndex_meta2echo_resource()
try:
return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
@@ -881,6 +882,7 @@ class ECHO_resource(Folder,Persistent):
{'label':'Sync Metadata','action':'ECHO_getResourceMD'},
{'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},
+ {'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
def getOverview(self):
@@ -969,6 +971,12 @@ class ECHO_resource(Folder,Persistent):
self.metaDataHash[field]=value[0:]
+ def copySearchFields(self):
+ """copys metadatafields to the object"""
+ fields=['author','title','year']
+ for field in fields:
+ setattr(self,'MD_'+field,self.getFieldValue(field))
+
def findLabelsFromMapping(self,referenceType):
"""gib hash mit label -> generic zurueck"""
@@ -1023,8 +1031,9 @@ class ECHO_resource(Folder,Persistent):
bibdata={}
retdata={}
fieldlist=self.standardMD.fieldList
-
+ fields=[]
for referenceTypeF in temp:
+ #print referenceType
if referenceTypeF[1].title.lower() == referenceType.lower():
try:
@@ -1046,11 +1055,14 @@ class ECHO_resource(Folder,Persistent):
(metadict, error)=readMetadata(self.metalink)
- self.contentType=metadict['bib_type'][0:]
+
self.metaDataHash={}
if not error=="": #Fehler beim Auslesen des Metafiles
+
return "ERROR:",error
+
+ self.contentType=metadict['bib_type'][0:]
fields=self.findTagsFromMapping(self.contentType)
#fields=self.findLabelsFromMapping(self.contentType)
@@ -1299,6 +1311,52 @@ class ECHO_collection(Folder, Persistent
viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes
+ path="/mpiwg/online/permanent/shipbuilding"
+
+ def updateCollection(self,RESPONSE=None):
+ """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
+ files=os.listdir(self.path)
+ ret=""
+ for fileName in files:
+
+ if fileName:
+
+ tempPath=re.sub("/mpiwg/online","",self.path)
+ link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"
+
+ metalink=self.path+"/"+fileName+"/index.meta"
+ try:
+
+ #link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb"
+
+ newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'generated','book','','','','','','')
+ self._setObject(fileName,newObj)
+
+ genObj=getattr(self,fileName)
+ #genObj.createIndexFile()
+ ret+="OK:"+fileName+"
"
+ except:
+ print "ERROR"
+ ret+="ERROR:"+fileName+"
"
+
+ return ret
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+ def updateCollectionMD(self,RESPONSE=None):
+ """updateMD"""
+ files=os.listdir(self.path)
+ for fileName in files:
+ if fileName:
+ genObj=getattr(self,fileName)
+ genObj.copyIndex_meta2echo_resource()
+ genObj.generate_title()
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
def changeViewerTemplateSetsForm(self):
"""change the viewer template set"""
@@ -1340,13 +1398,38 @@ class ECHO_collection(Folder, Persistent
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
for resource in resources:
- print resource[0]
+
resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+ def copySearchFields(self,RESPONSE=None):
+ """copys import metadatafields to the object"""
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+ for resource in resources:
+
+ resource[1].copySearchFields()
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+ def reloadMetaDataFromStorage(self,RESPONSE=None):
+ """copy metadata from the storage to ECHO"""
+ ret=""
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+ for resource in resources:
+
+ ret+=str(resource[1].copyIndex_meta2echo_resource())+"
"
+
+
+ if RESPONSE is not None:
+ # RESPONSE.redirect('manage_main')
+ return ret
+
def getPartnerCopyright(self,name,sonst="generic"):
"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
#print "hi",name,sonst
@@ -1589,6 +1672,8 @@ class ECHO_collection(Folder, Persistent
def ECHO_rerenderLinksMD(self,obj=None):
"""Rerender all Links"""
+ ret=""
+
if not obj:
obj = self
@@ -1596,16 +1681,20 @@ class ECHO_collection(Folder, Persistent
for entry in entries:
if entry[1].meta_type == 'ECHO_resource':
- entry[1].ECHO_getResourceMD(template="no")
- entry[1].generate_title()
- entry[1].generate_label()
+ try:
+ entry[1].ECHO_getResourceMD(template="no")
+ entry[1].generate_title()
+ entry[1].generate_label()
+ ret+="OK:"+entry[0]+"-- "+entry[1].getLabel().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
"
+ except:
+ ret+="Error:"+entry[0]+"
"
else:
self.ECHO_rerenderLinksMD(entry[1])
- return "Rerenderd all links to resources in: "+self.title
+ return ret+"Rerenderd all links to resources in: "+self.title
security.declarePublic('ECHO_newViewerLink')
@@ -1647,6 +1736,9 @@ class ECHO_collection(Folder, Persistent
{'label':'Graphics','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
{'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
+ {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'},
+ {'label':'ImportCollection','action':'updateCollection'},
+ {'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
def getOverview(self):
@@ -2071,6 +2163,16 @@ class ECHO_root(Folder,Persistent,Implic
meta_type="ECHO_root"
+ def showContent(self,path):
+ """return content/html"""
+
+ return urllib.urlopen(path+"/content_html").read()
+
+ def getImageViewers(self):
+ """images"""
+ viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject'])
+ return viewers
+
def getBibTag(self,tag,content):
"""get field tag für index-meta-generation"""