Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv4265/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
HighFrequencyAssetAction.java
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1281
Index: HighFrequencyAssetAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/HighFrequencyAssetAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HighFrequencyAssetAction.java 17 Feb 2009 05:32:03 -0000 1.2
+++ HighFrequencyAssetAction.java 17 Feb 2009 13:52:36 -0000 1.3
@@ -44,11 +44,13 @@
private static final String RESULTS = "results";
private static final String IMAGESEARCH = "imagesearch";
private static final String ATTACHMENTSEARCH = "attachmentsearch";
+ private static final String URLSEARCH = "urlsearch";
private static final String CONTENTCHANNEL = "contentchannel";
private static final String CREATIONREL = "creationrel";
private static final String CURRENTCHANNEL = "current";
private static final String ATTACHMENTS = "attachments";
private static final String IMAGES = "images";
+ private static final String URLS = "urls";
private static final String ALL = "all";
private static final String CREATION = "creation";
private static final String CONTENTELEMENT = "contentelement";
@@ -82,6 +84,8 @@
assetManager = cloud.getNodeManager(ATTACHMENTS);
} else if(assettypes.equals(IMAGES)){
assetManager = cloud.getNodeManager(IMAGES);
+ } else if(assettypes.equals(URLS)){
+ assetManager = cloud.getNodeManager(URLS);
}
NodeManager channelManager = cloud.getNodeManager(CONTENTCHANNEL);
@@ -101,7 +105,7 @@
NodeManager contentManager = cloud.getNodeManager(CONTENTELEMENT);
RelationStep assetrelStep= null;
- if(assettypes.equals(ATTACHMENTS)){
+ if(assettypes.equals(ATTACHMENTS)||assettypes.equals(URLS)){
assetrelStep = query.addRelationStep(contentManager, POSREL, SOURCE);
} else if(assettypes.equals(IMAGES)){
assetrelStep = query.addRelationStep(contentManager, IMAGEREL,
SOURCE);
@@ -192,6 +196,8 @@
targetForward = ATTACHMENTSEARCH;
} else if(assettypes.equals(IMAGES)){
targetForward = IMAGESEARCH;
+ } else if(assettypes.equals(URLS)){
+ targetForward = URLSEARCH;
}
return mapping.findForward(targetForward);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
