ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.242 and 1.253

version 1.242, 2005/10/26 17:09:20	version 1.253, 2005/11/11 15:41:26
Line 946 class ECHO_resource(CatalogAware,Folder,	Line 946 class ECHO_resource(CatalogAware,Folder,
self.contentType=self.bib_type	self.contentType=self.bib_type
for data in self.metadata:	for data in self.metadata:
data_neu=re.sub('-','_',data)	data_neu=re.sub('-','_',data)
self.meta	self.metaDataHash[data_neu]=getattr(self,data)[0:]
DataHash[data_neu]=getattr(self,data)[0:]


pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')	pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
Line 1039 class ECHO_resource(CatalogAware,Folder,	Line 1038 class ECHO_resource(CatalogAware,Folder,
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


def getMDValue(self,fieldName,empty=None):

	def getMDValue(self,fieldNameTest,empty=None,generic=None):
	"""get md values"""
	#TODO: cache mappinghash

	fieldName=None
	if generic:
	ct=self.contentType.replace(" ","_").lower()

	#caching
	if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
	self._v_mapHash={}

	tmp=self._v_mapHash.get(ct,None)
	if tmp: #teste ob type schon existiert
	fieldName=tmp.get(fieldNameTest,None)
	else:
	self._v_mapHash[ct]={}

	#noch nicht gecached
	if not fieldName and hasattr(self.standardMD,ct):
	fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
	self._v_mapHash[ct][fieldNameTest]=fieldName
	if not fieldName:
	fieldName=fieldNameTest
if not empty:	if not empty:
	#FIXME: warum gibt es manchmal kein metadatahas
	try:
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)	return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
	except:
	zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
	return ""

else:	else:
return self.metaDataHash.get(fieldName,empty)
	return self.metaDataHash.get(fieldNameTest,empty)

	getFieldValue=getMDValue #depricated

def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):	def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
"""new index.meta"""	"""new index.meta"""
Line 1155 class ECHO_resource(CatalogAware,Folder,	Line 1187 class ECHO_resource(CatalogAware,Folder,



def getFieldValue(self,field):
"""get value"""

try:

ret=self.metaDataHash[field]
if ret == "":
return None
else:

return ret
except:
return None

def getMetaDataHash(self):	def getMetaDataHash(self):
"""md hash"""	"""md hash"""
return self.metaDataHash	return self.metaDataHash

def setFieldValue(self,field,value):	def setFieldValue(self,field,value):
"""get value"""	"""get value"""
	#TODO: remove setFieldValue

if not hasattr(self,'metaDataHash'):	if not hasattr(self,'metaDataHash'):
setattr(self,'metaDataHash',{})	setattr(self,'metaDataHash',{})
Line 1184 class ECHO_resource(CatalogAware,Folder,	Line 1203 class ECHO_resource(CatalogAware,Folder,
def copySearchFields(self):	def copySearchFields(self):
"""copys metadatafields to the object"""	"""copys metadatafields to the object"""
fields=['author','title','year']	fields=['author','title','year']

for field in fields:	for field in fields:
setattr(self,'MD_'+field,self.getFieldValue(field))	setattr(self,'MD_'+field,self.getMDValue(field,generic="yes"))


def findLabelsFromMapping(self,referenceType):	def findLabelsFromMapping(self,referenceType):
Line 1238 class ECHO_resource(CatalogAware,Folder,	Line 1258 class ECHO_resource(CatalogAware,Folder,





bibdata={}	bibdata={}
retdata={}	retdata={}
fieldlist=self.standardMD.fieldList	fieldlist=self.standardMD.fieldList
Line 1289 class ECHO_resource(CatalogAware,Folder,	Line 1307 class ECHO_resource(CatalogAware,Folder,
if RESPONSE:	if RESPONSE:
return RESPONSE.redirect('manage_main')	return RESPONSE.redirect('manage_main')

def ECHO_getResourceMD(self,template="yes",back=None):	return "OK:",self.absolute_url(),self.contentType

	def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""	"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
(metadict, error)=readMetadata(self.metalink)	(metadict, error)=readMetadata(self.metalink)

Line 1299 class ECHO_resource(CatalogAware,Folder,	Line 1319 class ECHO_resource(CatalogAware,Folder,
if not error=="": #Fehler beim Auslesen des Metafiles	if not error=="": #Fehler beim Auslesen des Metafiles
return "ERROR:",error	return "ERROR:",error

if not self.contentType:	if (not self.contentType) or (overwrite=="yes"):
self.contentType=metadict['bib_type'].lower()	self.contentType=metadict['bib_type'].lower()

if not (metadict['bib_type'].lower()==self.contentType.lower()):	if not (metadict['bib_type'].lower()==self.contentType.lower()):
Line 1426 class ECHO_externalLink(Folder,ECHO_basi	Line 1446 class ECHO_externalLink(Folder,ECHO_basi
security.declarePublic('content_html')	security.declarePublic('content_html')
def content_html(self):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
return ECHO_basis.content_html(self,'externalLink')	ret= ECHO_basis.content_html(self,'externalLink')


	try:
	return ret.encode('utf-8')

	except:
	try:
	return ret.decode('latin-1')
	except:

	return ret

def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):	def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):

Line 1499 class ECHO_link(ECHO_externalLink):	Line 1530 class ECHO_link(ECHO_externalLink):
"""external_link"""	"""external_link"""

meta_type="ECHO_link"	meta_type="ECHO_link"

manage_options = ECHO_externalLink.manage_options+(	manage_options = ECHO_externalLink.manage_options+(
{'label':'add links config','action':'ECHO_link_addLinksForm'},	{'label':'add links config','action':'ECHO_link_addLinksForm'},
)	)
Line 1518 class ECHO_link(ECHO_externalLink):	Line 1550 class ECHO_link(ECHO_externalLink):
def content_html(self):	def content_html(self):
"""template fuer link"""	"""template fuer link"""


if hasattr(self,"link_template"):	if hasattr(self,"link_template"):
ret=ECHO_basis.content_html(self,'link')	ret=ECHO_basis.content_html(self,'link')

else:	else:
ret=ECHO_basis.content_html(self,'collection')	ret=ECHO_basis.content_html(self,'collection')

try:
return ret.decode('utf-8')	#return ret
except:
return ret	return ret
	#
	#
	# try:
	# return ret.decode('utf-8')
	# except:
	# try:
	# return ret.decode('latin-1')
	# except:
	#
	# return ret
	#


def index_html(self):	def index_html(self):
"""standard link"""	"""standard link"""
Line 1779 class ECHO_collection(Folder, Persistent	Line 1824 class ECHO_collection(Folder, Persistent
pass	pass
return ret	return ret

def updateCollection(self,RESPONSE=None):	def importCollection(self,path=None,RESPONSE=None):
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""	"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
files=os.listdir(self.path)
	if path is None:
	pt=zptFile(self, 'zpt/importCollection.zpt')
	return pt()

	files=os.listdir(path)
ret=""	ret=""
for fileName in files:	for fileName in files:

if fileName:	if fileName:

tempPath=re.sub("/mpiwg/online","",self.path)	tempPath=re.sub("/mpiwg/online","",path)
link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"	link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"

metalink=self.path+"/"+fileName+"/index.meta"	metalink=self.path+"/"+fileName+"/index.meta"
Line 1810 class ECHO_collection(Folder, Persistent	Line 1860 class ECHO_collection(Folder, Persistent
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	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):	def changeViewerTemplateSetsForm(self):
"""change the viewer template set"""	"""change the viewer template set"""
pt=zptFile(self, 'zpt/changeViewerTemplateSet')	pt=zptFile(self, 'zpt/changeViewerTemplateSet')
Line 1914 class ECHO_collection(Folder, Persistent	Line 1950 class ECHO_collection(Folder, Persistent
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def copySearchFields(self,RESPONSE=None):	def copySearchFields(self,RESPONSE=None):
"""copys import metadatafields to the object"""	"""copys < metadatafields to the object"""
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)

for resource in resources:	for resource in resources:

Line 1933 class ECHO_collection(Folder, Persistent	Line 1969 class ECHO_collection(Folder, Persistent
def reloadMetaDataFromStorage(self,RESPONSE=None):	def reloadMetaDataFromStorage(self,RESPONSE=None):
"""copy metadata from the storage to ECHO"""	"""copy metadata from the storage to ECHO"""

return reloadMetaDataFromStorage(self,RESPONSE=None)	return reloadMetaDataFromStorage(self,RESPONSE)


def getPartnerCopyright(self,name,sonst="generic"):	def getPartnerCopyright(self,name,sonst="generic"):
Line 2144 class ECHO_collection(Folder, Persistent	Line 2180 class ECHO_collection(Folder, Persistent
{'label':'Set Startpage','action':'setStartpageFolderForm'},	{'label':'Set Startpage','action':'setStartpageFolderForm'},
{'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},	{'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},	{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
{'label':'ImportCollection','action':'updateCollection'},	{'label':'ImportCollection','action':'importCollection'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)	)

Line 2241 class ECHO_collection(Folder, Persistent	Line 2277 class ECHO_collection(Folder, Persistent
"""template fuer content"""	"""template fuer content"""
#print "NN",argv	#print "NN",argv
ret = ECHO_basis.content_html(self,'collection')	ret = ECHO_basis.content_html(self,'collection')

try:	try:
return ret.decode('utf-8')	return ret.encode('utf-8')
except:	except:

	try:
	return ret.decode('latin-1')
	except:

return ret	return ret

def getCredits(self):	def getCredits(self):

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.242
changed lines
	Added in v.1.253