--- cdli/zpt/BasketVersionMain.zpt	2007/03/23 17:15:36	1.11
+++ cdli/zpt/BasketVersionMain.zpt	2008/10/29 12:10:05	1.13
@@ -11,7 +11,7 @@
   <table width="100%" border=0 cellpadding=0 cellspacing=0>
   <tr>
   <td>
-  <h2>Basket: <span tal:replace="python:here.aq_parent.title"/></h2>
+ <h2>Basket: <span tal:replace="python:here.aq_parent.title"/></h2>
   <p>Your basket contains <span tal:replace="here/numberOfItems"/> files(s).</p>
   <p>You can now: </p>
    <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile'"> download basket (combined in one file)</a></p>
@@ -37,7 +37,7 @@
 	<input name="searchStr"><input type="hidden" name="skip" value="50">
 	<input type="hidden" name="start" value="0"><input type="submit" value="search">
 	<input type="hidden" name="hl" value="yes">
-	<br> Use regexp:
+	<br> Use regexp (currently very slow):
 	<input type="radio" name="regExp" value="no" checked="true">No
 	<input type="radio" name="regExp" value="yes">Yes
 	<br>  
@@ -107,35 +107,35 @@ Note that any file you download will hav
  
       
   <tal:x repeat="result batch">
-  <tal:x tal:define="version python:here.getFile(result);lastVersion python:here.getFileLastVersion(result);actual python:here.isActual(result);">
+  <tal:x tal:define="version python:here.getFileObject(result[0]);lastVersion python:version.getVersionNr(result[1]);actual python:here.isActual(version,result[1]);">
     <tr tal:attributes="class python:test(actual[0],'actual','old')">
 	<td><nobr><input type="checkbox" tal:attributes="value version/getId" name="ids">
-		<tal:x condition="python:actual[1]==-1">DEL</tal:x>   <a tal:content="python:version.getTitle()" tal:attributes="href python:here.getObjUrl(result)+'/'+lastVersion.getId()+'/view?fromBasket='+here.aq_parent.id+'&filenr='+str(results.index(result))"/></nobr>
+		<tal:x condition="python:actual[1]==-1">DEL</tal:x>   <a tal:content="python:version.getTitle()" tal:attributes="href python:here.getObjUrl(result[0])+'/'+lastVersion.getId()+'/view?fromBasket='+here.aq_parent.id+'&filenr='+str(results.index(result))"/></nobr>
     </td>
     <td tal:condition="python:hasattr(lastVersion,'getDesignation')">
-		   <span tal:content="lastVersion/getDesignation"/>
+		   <span tal:content="python:here.unicodify(lastVersion.getDesignation())"/>
      </td>
       <td tal:condition="not:python:hasattr(lastVersion,'getDesignation')">
 		   <span tal:content="python:'error'"/>
      </td>
 	<td>
 	<span tal:replace="lastVersion/getVersionNumber"/>
-	<nobr><a tal:attributes="href python:here.getObjUrl(result)+'/history'">(history)</a></nobr>
+	<nobr><a tal:attributes="href python:here.getObjUrl(result[0])+'/history'">(history)</a></nobr>
 	</td>
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
 	<td tal:content="lastVersion/getVersionComment"/>
-        <td><a tal:attributes="href python:here.getObjUrl(result)+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
+        <td><a tal:attributes="href python:here.getObjUrl(result[0])+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
        <!-- <td><a tal:attributes="href python:version.absolute_url()+'/manageCommentForm'"><small tal:content="python:version.getComment()"/></a></td>-->
-	<td><a tal:attributes="href python:here.getObjUrl(result)">download</a></td>
+	<td><a tal:attributes="href python:here.getObjUrl(result[0])">download</a></td>
 	
-	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/downloadLocked'">download and lock</a></td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/downloadLocked'">download and lock</a></td>
 	<td tal:condition="not:python:version.lockedBy==''"><a>locked</a></td>
 	
-	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/'+version.title+'/addCDLIFileObjectForm?come_from='+here.URLquote(here.absolute_url())">Upload New Version</a> </td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/'+version.title+'/addCDLIFileObjectForm?come_from='+here.URLquote(here.absolute_url())">Upload New Version</a> </td>
 	<td tal:condition="not:python:version.lockedBy==''">
-	  <b tal:attributes="href python:here.getObjUrl(result)+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
-	  <a tal:attributes="href python:here.getObjUrl(result)+'/unlock'">unlock</a>
+	  <b tal:attributes="href python:here.getObjUrl(result[0])+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
+	  <a tal:attributes="href python:here.getObjUrl(result[0])+'/unlock'">unlock</a>
 	</td>
 	<td>
 	 <a tal:repeat="collection python:version.isContainedInBaskets(context=here)" tal:content="collection/title"