Changeset 547 for CMESS/mediaplayer/branches

Timestamp:

14.05.2009 16:31:49 (3 years ago)

Author:

chris

Message:

• ZMSGallery: get titlestr via regular expression

File:

• CMESS/mediaplayer/branches/3.0/com/zms/mediaplayer/xml/mediaplayer.metaobj.xml (modified) (3 diffs)

CMESS/mediaplayer/branches/3.0/com/zms/mediaplayer/xml/mediaplayer.metaobj.xml

@@ -1263 +1263 @@
                         <dtml-let ob=sequence-item>
                                 <dtml-if "content_type.find('image')>=0">
-                                        <dtml-if "filename.find('_large') > 0">
+                                        <dtml-if "filename.find('_large.') > 0">
                                                 <dtml-call "REQUEST.set('imgSuperres['+filename[:-10]+']',ob)">
                                                 <dtml-if "filename[:-10] not in imgFilenames">
                                                         <dtml-call "imgFilenames.append(filename[:-10])">
                                                 </dtml-if>
-                                        <dtml-elif "filename.find('_medium') > 0">
+                                        <dtml-elif "filename.find('_medium.') > 0">
                                                 <dtml-call "REQUEST.set('imgHires['+filename[:-11]+']',ob)">
                                                 <dtml-if "filename[:-11] not in imgFilenames">
                                                         <dtml-call "imgFilenames.append(filename[:-11])">
                                                 </dtml-if>
-                                        <dtml-elif "filename.find('_small') > 0">
+                                        <dtml-elif "filename.find('_small.') > 0">
                                                 <dtml-call "REQUEST.set('imgImg['+filename[:-10]+']',ob)">
                                                 <dtml-if "filename[:-10] not in imgFilenames">
@@ -1385 +1385 @@
                 <li>
                 <dtml-let 
-                        titlestr="getObjProperty('img_attrs_spec',REQUEST).split('title='+QUOT)">
-                        <a class="thumb" href="<dtml-var "getObjProperty('imghires',REQUEST).getHref(REQUEST)">" title="<dtml-if "len(titlestr)>0"><dtml-var "titlestr[1].split(QUOT)[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if>">
-                                <img src="<dtml-var "getObjProperty('img',REQUEST).getHref(REQUEST)">" alt="<dtml-if "len(titlestr)>0"><dtml-var "titlestr[1].split(QUOT)[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if>" />
+                        titlestr="re_search('title='+QUOT+'(.*)'+QUOT, getObjProperty('img_attrs_spec',REQUEST))">
+                        <a class="thumb" href="<dtml-var "getObjProperty('imghires',REQUEST).getHref(REQUEST)">" title="<dtml-if "len(titlestr[0])>0"><dtml-var "titlestr[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if>">
+                                <img src="<dtml-var "getObjProperty('img',REQUEST).getHref(REQUEST)">" alt="<dtml-if "len(titlestr[0])>0"><dtml-var "titlestr[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if>" />
                         </a>
                         <div class="caption">
@@ -1395 +1395 @@
                                 </div>
                                 </dtml-if>
-                                <div class="image-title"><dtml-if "len(titlestr)>0"><dtml-var "titlestr[1].split(QUOT)[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if></div>
+                                <div class="image-title"><dtml-if "len(titlestr[0])>0"><dtml-var "titlestr[0]"><dtml-else>Image #<dtml-var sequence-number></dtml-if></div>
                                 <div class="image-desc"><dtml-var "getObjProperty('text',REQUEST)" newline_to_br></div>
                         </div>