Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
In directory 
james.mmbase.org:/tmp/cvs-serv24166/cmsc/maintenance/src/webapp/editors/maintenance

Modified Files:
        create-relations-asset-channel.jsp 
Log Message:
CMSC-1192 - add SQL script to migrate all images/attachments/URLs to new 
assetstable - improved functionality


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
See also: http://www.mmbase.org/jira/browse/CMSC-1192


Index: create-relations-asset-channel.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/create-relations-asset-channel.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- create-relations-asset-channel.jsp  6 Feb 2009 15:03:06 -0000       1.6
+++ create-relations-asset-channel.jsp  10 Feb 2009 12:29:53 -0000      1.7
@@ -40,12 +40,12 @@
       <c:if test="${param.type == 'root'}">
       <mm:write referid="number" jspvar="number" vartype="Integer">
          <% if(number < 1) {
-            new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null);
+            new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null, 
null);
             out.println("Total Asset count : 
"+pageContext.getAttribute("totalCount")+"  added creationrel count : 
"+pageContext.getAttribute("addedRelationCount"));
          }
          else {
             if(RepositoryUtil.isChannel(String.valueOf(number))) {
-            new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null);
+            new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null, 
null);
             out.println("Total Asset count : 
"+pageContext.getAttribute("totalCount")+"  added creationrel count : 
"+pageContext.getAttribute("addedRelationCount"));
          }
          else {
@@ -61,13 +61,8 @@
 
          <mm:write referid="number" jspvar="number" vartype="Integer">
          <%
-            if( !RepositoryUtil.isChannel(String.valueOf(number))) {
                      new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,"selfselect","firstElem");
                      out.println("Total Asset count : 
"+pageContext.getAttribute("totalCount")+"  added creationrel count : 
"+pageContext.getAttribute("addedRelationCount"));
-            }
-            else {
-                  out.println("The number should be a channel number!");
-               }
          %>
          </mm:write>
       </c:if>
@@ -75,8 +70,10 @@
       <%-- rootWhenUndetermined --%>
       <c:if test="${param.selfselectLogic=='rootWhenUndetermined'}">
          <mm:write referid="number" jspvar="number" vartype="Integer">
-         <%
-            if (!RepositoryUtil.isChannel(String.valueOf(number))) {
+         <% if(number < 1) {
+               new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,"selfselect","rootWhenUndetermined");
+               out.println("Total Asset count : 
"+pageContext.getAttribute("totalCount")+"  added creationrel count : 
"+pageContext.getAttribute("addedRelationCount"));
+            } else if (RepositoryUtil.isChannel(String.valueOf(number))) {
                new 
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,"selfselect","rootWhenUndetermined");
                out.println("Total Asset count : 
"+pageContext.getAttribute("totalCount")+"  added creationrel count : 
"+pageContext.getAttribute("addedRelationCount"));
             }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to