mcardle 2005/09/06 16:02:45 CEST
Modified files:
core/src/java/org/jahia/services/esi Fragment.java
Log:
* adds support for the aclGroup fragment attribute to share fragments between
users with the same group permissions
* added support for "&" seperated URL parameters
Revision Changes Path
1.5 +6 -4 jahia/core/src/java/org/jahia/services/esi/Fragment.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/Fragment.java.diff?r1=1.4&r2=1.5&f=h
Index: Fragment.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/Fragment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Fragment.java 30 Aug 2005 15:40:12 -0000 1.4
+++ Fragment.java 6 Sep 2005 14:02:45 -0000 1.5
@@ -2,6 +2,7 @@
import org.jahia.services.esi.JesiObject;
import org.jahia.services.esi.EsiService;
+import org.jahia.taglibs.esi.JesiConst;
/**
@@ -28,34 +29,35 @@
public String fragGroup = null;//holds the 'group' value in the query
string, not in the path part of URL.
- Fragment (int siteID, int pageID, int fragID, String URL) {
+ Fragment (int siteID, int pageID, int fragID, String URL, String
aclGroup) {
this.siteID = siteID;
this.pageID = pageID;
this.fragID = fragID;
this.URL = URL;
+ this.aclGroup = aclGroup;
objType = "Fragment";
parseUrl(URL);
+ //TODO:use java.net.URL instead
if (query != null) {
//extract user part of url query string
int pos = query.indexOf("user=");
if (pos != -1) {
- int posPlus = query.indexOf("+",pos + "user=".length());
+ int posPlus = query.indexOf("&",pos + "user=".length());
fragUser = query.substring(pos,
(posPlus==-1)?query.length():posPlus );
//since user= might be the last parameter
}
//extract group part of url query string
pos = query.indexOf("group=");
if (pos != -1) {
- int posPlus = query.indexOf("+",pos + "group=".length());
+ int posPlus = query.indexOf("&",pos + "group=".length());
fragGroup = query.substring(pos,
(posPlus==-1)?query.length():posPlus ); //since group= might be the last
parameter
}
}
-
}
public String getObjDetails() {
