[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetUploadAction.java
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms In directory james.mmbase.org:/tmp/cvs-serv29032/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms Modified Files: AssetUploadAction.java Log Message: CMSC-1089 change Assets display in two ways. list and thumbnails. upload image/attachment 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-1089 Index: AssetUploadAction.java === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- AssetUploadAction.java 21 Nov 2008 02:32:59 - 1.2 +++ AssetUploadAction.java 21 Nov 2008 02:34:47 - 1.3 @@ -20,7 +20,6 @@ import org.mmbase.bridge.NodeManager; import com.finalist.cmsc.services.versioning.Versioning; -import com.finalist.cmsc.services.versioning.VersioningException; import com.finalist.cmsc.struts.MMBaseAction; import com.finalist.util.http.BulkUploadUtil; ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetUploadAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv28864/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetUploadAction.java
Log Message:
CMSC-1089 change Assets display in two ways. list and thumbnails. upload
image/attachment
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-1089
Index: AssetUploadAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetUploadAction.java 7 Nov 2008 02:54:48 - 1.1
+++ AssetUploadAction.java 21 Nov 2008 02:32:59 - 1.2
@@ -19,6 +19,8 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.NodeManager;
+import com.finalist.cmsc.services.versioning.Versioning;
+import com.finalist.cmsc.services.versioning.VersioningException;
import com.finalist.cmsc.struts.MMBaseAction;
import com.finalist.util.http.BulkUploadUtil;
@@ -37,16 +39,23 @@
if (file.getFileSize() != 0 && file.getFileName() != null) {
String uploadFileType = file.getContentType();
+ List nodes = null;
if (assetType.equalsIgnoreCase("images")) {
if (uploadFileType.equalsIgnoreCase("image/bmp") ||
uploadFileType.equalsIgnoreCase("image/jpeg") ||
uploadFileType.equalsIgnoreCase("image/gif")){
- List nodes = BulkUploadUtil.store(cloud, manager,
parentchannel, file);
+ nodes = BulkUploadUtil.store(cloud, manager, parentchannel,
file);
request.setAttribute("uploadedAssets", nodes);
}
}
else if(assetType.equalsIgnoreCase("attachments")){
-List nodes = BulkUploadUtil.store(cloud, manager,
parentchannel, file);
+nodes = BulkUploadUtil.store(cloud, manager, parentchannel, file);
request.setAttribute("uploadedAssets", nodes);
}
+ // to archive the upload asset
+ if (nodes != null && nodes.size() > 0) {
+for (Integer node : nodes) {
+ Versioning.addVersion(cloud.getNode(node));
+}
+ }
}
return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?type=asset&direction=down&parentchannel="
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http BulkUploadUtil.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
In directory
james.mmbase.org:/tmp/cvs-serv28864/cmsc/utilities/src/java/com/finalist/util/http
Modified Files:
BulkUploadUtil.java
Log Message:
CMSC-1089 change Assets display in two ways. list and thumbnails. upload
image/attachment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
See also: http://www.mmbase.org/jira/browse/CMSC-1089
Index: BulkUploadUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- BulkUploadUtil.java 20 Nov 2008 07:43:24 - 1.11
+++ BulkUploadUtil.java 21 Nov 2008 02:33:00 - 1.12
@@ -35,8 +35,6 @@
import org.mmbase.bridge.NodeManager;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.services.versioning.Versioning;
-import com.finalist.cmsc.services.versioning.VersioningException;
import com.finalist.cmsc.util.UploadUtil;
import com.finalist.cmsc.util.UploadUtil.BinaryData;
@@ -161,13 +159,6 @@
RelationUtil.createRelation(node,
manager.getCloud().getNode(parentChannel), "creationrel");
- //to archive the upload asset
- try {
- Versioning.addVersion(node);
- } catch (VersioningException e) {
- log.error("Failed to archive uploaded file", e);
- }
-
return node;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/mcquestions index.jsp ratemcquestions.jsp
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions
In directory james.mmbase.org:/tmp/cvs-serv18568
Modified Files:
index.jsp ratemcquestions.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/mcquestions
Index: index.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/index.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- index.jsp 20 Nov 2008 15:10:43 - 1.15
+++ index.jsp 20 Nov 2008 17:45:01 - 1.16
@@ -63,8 +63,9 @@
-
-
+${givenanswers}
+
+
Index: ratemcquestions.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/ratemcquestions.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ratemcquestions.jsp 20 Nov 2008 15:10:43 - 1.16
+++ ratemcquestions.jsp 20 Nov 2008 17:45:01 - 1.17
@@ -4,6 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:di="http://www.didactor.nl/ditaglib_1.0"; >
@@ -49,7 +50,9 @@
-
+
+
+
@@ -72,18 +75,15 @@
.
- Value for givenanser (${question}_${_node}):
${givenanswer}
-
0
-this answer was not given
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/java/nl/didactor/education/functions LearnObjectQuestions.java GivenAnswers.java
Update of
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education/functions
In directory
james.mmbase.org:/tmp/cvs-serv17541/src/education/java/nl/didactor/education/functions
Modified Files:
GivenAnswers.java
Added Files:
LearnObjectQuestions.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/java/nl/didactor/education/functions
LearnObjectQuestions.java is new
Index: GivenAnswers.java
===
RCS file:
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education/functions/GivenAnswers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- GivenAnswers.java 20 Nov 2008 15:09:40 - 1.3
+++ GivenAnswers.java 20 Nov 2008 16:57:44 - 1.4
@@ -10,7 +10,7 @@
/**
* Givenanswers for a certain question.
* @author Michiel Meeuwissen
- * @version $Id: GivenAnswers.java,v 1.3 2008/11/20 15:09:40 michiel Exp $
+ * @version $Id: GivenAnswers.java,v 1.4 2008/11/20 16:57:44 michiel Exp $
*/
public class GivenAnswers {
protected final static Logger log =
Logging.getLoggerInstance(GivenAnswers.class);
@@ -54,8 +54,6 @@
RelationStep srs = sq.addRelationStep(copybooks, "related",
"SOURCE");
sq.addNode(srs.getNext(), copybook.getNumber());
mt = madetests.getList(sq);
-log.info("Made tests " + mt);
-
}
@@ -74,8 +72,6 @@
RelationStep rs = q.addRelationStep(copybooks, "related", "SOURCE");
q.addNode(rs.getNext(), copybook.getNumber());
NodeList result = givenanswers.getList(q);
-log.info("" + q.toSql());
-log.info("" + result);
return result;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/mihxil/statistics/src/org/mmbase/math Measurement.java
Update of /var/cvs/speeltuin/mihxil/statistics/src/org/mmbase/math
In directory james.mmbase.org:/tmp/cvs-serv17039/src/org/mmbase/math
Modified Files:
Measurement.java
Log Message:
no point in showing std if only one value
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/statistics/src/org/mmbase/math
Index: Measurement.java
===
RCS file:
/var/cvs/speeltuin/mihxil/statistics/src/org/mmbase/math/Measurement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Measurement.java16 Oct 2008 11:26:08 - 1.8
+++ Measurement.java20 Nov 2008 16:32:08 - 1.9
@@ -19,7 +19,7 @@
*
* @author Michiel Meeuwissen
* @since mm-statistics-1.0
- * @version $Id: Measurement.java,v 1.8 2008/10/16 11:26:08 michiel Exp $
+ * @version $Id: Measurement.java,v 1.9 2008/11/20 16:32:08 michiel Exp $
*/
@@ -100,6 +100,13 @@
return count;
}
+public double getSum() {
+return sum;
+}
+public double getSumOfSquares() {
+return squareSum;
+}
+
/**
* Operator overloading would be very handy here, but java sucks.
*/
@@ -279,8 +286,10 @@
return
(useE ? "(" : "") +
nf.format(mean.coefficient) +
+(count > 1 ? (
" \u00B1 " + /* +/- */
-nf.format(std.coefficient) +
+ nf.format(std.coefficient)
+ ) : "" ) +
(useE ?
(")\u00B710" + /* .10 */
superscript(mean.exponent))
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/java/nl/didactor/education/functions GivenAnswers.java
Update of
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education/functions
In directory
james.mmbase.org:/tmp/cvs-serv14970/education/java/nl/didactor/education/functions
Modified Files:
GivenAnswers.java
Log Message:
added some functions to make jsps simpler
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/java/nl/didactor/education/functions
Index: GivenAnswers.java
===
RCS file:
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education/functions/GivenAnswers.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- GivenAnswers.java 17 Nov 2008 17:40:51 - 1.2
+++ GivenAnswers.java 20 Nov 2008 15:09:40 - 1.3
@@ -10,7 +10,7 @@
/**
* Givenanswers for a certain question.
* @author Michiel Meeuwissen
- * @version $Id: GivenAnswers.java,v 1.2 2008/11/17 17:40:51 michiel Exp $
+ * @version $Id: GivenAnswers.java,v 1.3 2008/11/20 15:09:40 michiel Exp $
*/
public class GivenAnswers {
protected final static Logger log =
Logging.getLoggerInstance(GivenAnswers.class);
@@ -34,6 +34,12 @@
}
+protected Node getMadeTestHolder(Node test) {
+return test.getFunctionValue("madetestholder", null).toNode();
+
+}
+
+
/**
*/
public NodeList givenanswers() {
@@ -44,10 +50,12 @@
NodeList mt = null;
if (test != null) {
-NodeQuery sq = Queries.createRelatedNodesQuery(test, madetests,
"related", "DESTINATION");
+NodeQuery sq =
Queries.createRelatedNodesQuery(getMadeTestHolder(test), madetests, "related",
"DESTINATION");
RelationStep srs = sq.addRelationStep(copybooks, "related",
"SOURCE");
sq.addNode(srs.getNext(), copybook.getNumber());
mt = madetests.getList(sq);
+log.info("Made tests " + mt);
+
}
@@ -65,8 +73,10 @@
RelationStep rs = q.addRelationStep(copybooks, "related", "SOURCE");
q.addNode(rs.getNext(), copybook.getNumber());
-
-return givenanswers.getList(q);
+NodeList result = givenanswers.getList(q);
+log.info("" + q.toSql());
+log.info("" + result);
+return result;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/tests view_feedback.jspx
Update of /var/cvs/contributions/didactor2/src/education/templates/education/tests In directory james.mmbase.org:/tmp/cvs-serv15140/tests Modified Files: view_feedback.jspx Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/tests Index: view_feedback.jspx === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/tests/view_feedback.jspx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- view_feedback.jspx 13 Nov 2008 12:18:55 - 1.3 +++ view_feedback.jspx 20 Nov 2008 15:10:43 - 1.4 @@ -3,6 +3,7 @@ xmlns:di="http://www.didactor.nl/ditaglib_1.0"; xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; xmlns:jsp="http://java.sun.com/JSP/Page";> + : ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/mcquestions index.jsp ratemcquestions.jsp view.jspx
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions
In directory james.mmbase.org:/tmp/cvs-serv15140/mcquestions
Modified Files:
index.jsp ratemcquestions.jsp view.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/mcquestions
Index: index.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/index.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- index.jsp 13 Nov 2008 10:42:48 - 1.14
+++ index.jsp 20 Nov 2008 15:10:43 - 1.15
@@ -19,14 +19,14 @@
4: all answers next to eachtother / fixed order
5: pulldown menu (only for type 0) / fixed order
-->
-
-
+
-
+
-
+
Index: ratemcquestions.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/ratemcquestions.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ratemcquestions.jsp 10 Nov 2008 17:54:02 - 1.15
+++ ratemcquestions.jsp 20 Nov 2008 15:10:43 - 1.16
@@ -23,6 +23,8 @@
+ Rating for ${madetest}
+
@@ -72,9 +74,9 @@
.
Value for givenanser (${question}_${_node}):
${givenanswer}
-this answer was given
-
+
+
0
Index: view.jspx
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/view.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- view.jspx 7 Nov 2008 16:54:31 - 1.6
+++ view.jspx 20 Nov 2008 15:10:43 - 1.7
@@ -11,7 +11,7 @@
:
-
+
,
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor/functions RichQuestions.java
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/functions In directory james.mmbase.org:/tmp/cvs-serv14970/richtext/java/nl/didactor/functions Added Files: RichQuestions.java Log Message: added some functions to make jsps simpler See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor/functions RichQuestions.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/builders/richtext xmlcontent.xml
Update of /var/cvs/contributions/didactor2/src/richtext/config/builders/richtext In directory james.mmbase.org:/tmp/cvs-serv14970/richtext/config/builders/richtext Modified Files: xmlcontent.xml Log Message: added some functions to make jsps simpler See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/builders/richtext Index: xmlcontent.xml === RCS file: /var/cvs/contributions/didactor2/src/richtext/config/builders/richtext/xmlcontent.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- xmlcontent.xml 28 Aug 2008 14:43:06 - 1.3 +++ xmlcontent.xml 20 Nov 2008 15:09:40 - 1.4 @@ -24,9 +24,17 @@ richtext.createnewxmlcontent richtext.createnewxmlcontentdescription +true + + + + nl.didactor.functions.RichQuestions + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/java/nl/didactor/education Functions.java
Update of
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education
In directory
james.mmbase.org:/tmp/cvs-serv14970/education/java/nl/didactor/education
Modified Files:
Functions.java
Log Message:
added some functions to make jsps simpler
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/java/nl/didactor/education
Index: Functions.java
===
RCS file:
/var/cvs/contributions/didactor2/src/education/java/nl/didactor/education/Functions.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Functions.java 18 Jul 2008 13:43:00 - 1.5
+++ Functions.java 20 Nov 2008 15:09:40 - 1.6
@@ -9,7 +9,7 @@
/**
* Several functions on mmbase nodes which are used by didactor.
* @author Michiel Meeuwissen
- * @version $Id: Functions.java,v 1.5 2008/07/18 13:43:00 michiel Exp $
+ * @version $Id: Functions.java,v 1.6 2008/11/20 15:09:40 michiel Exp $
*/
public class Functions {
protected final static Logger log =
Logging.getLoggerInstance(Functions.class);
@@ -68,4 +68,21 @@
}
+/**
+ * Attach the made test object to the nearest object which' node manager
has the
+ * 'madetestholder' property.
+ */
+public Node madetestholder() {
+Cloud cloud = node.getCloud();
+for (int n : path()) {
+Node node = cloud.getNode(n);
+NodeManager nm = node.getNodeManager();
+if ("true".equals(nm.getProperty("madetestholder"))) {
+return node;
+}
+}
+return null;
+}
+
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/config/builders/didactor_education givenanswers.xml learnblocks.xml learnobjects.xml tests.xml
Update of /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education In directory james.mmbase.org:/tmp/cvs-serv14970/education/config/builders/didactor_education Modified Files: givenanswers.xml learnblocks.xml learnobjects.xml tests.xml Log Message: added some functions to make jsps simpler See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/config/builders/didactor_education Index: givenanswers.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/givenanswers.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- givenanswers.xml17 Nov 2008 15:01:12 - 1.2 +++ givenanswers.xml20 Nov 2008 15:09:40 - 1.3 @@ -81,5 +81,32 @@ + + + +Gemaakte test +Made test + + 3 + + http://www.mmbase.org/xmlns/datatypes"; > + + + http://www.mmbase.org/xmlns/searchquery";> + + + + + +madetests + + + + +madetests + + + + Index: learnblocks.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/learnblocks.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- learnblocks.xml 30 Oct 2008 09:08:07 - 1.4 +++ learnblocks.xml 20 Nov 2008 15:09:40 - 1.5 @@ -23,6 +23,7 @@ name +true Index: learnobjects.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/learnobjects.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- learnobjects.xml22 Aug 2008 11:27:32 - 1.7 +++ learnobjects.xml20 Nov 2008 15:09:40 - 1.8 @@ -89,6 +89,13 @@ org.mmbase.util.functions.PatternNodeFunctionProvider + + + nl.didactor.education.Functions + + + nl.didactor.education.functions.LearnObjectQuestions + Index: tests.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/tests.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- tests.xml 17 Nov 2008 17:40:51 - 1.3 +++ tests.xml 20 Nov 2008 15:09:40 - 1.4 @@ -23,6 +23,7 @@ 9 +true ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/functions CopyBookMadeTest.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions
In directory james.mmbase.org:/tmp/cvs-serv14970/core/java/nl/didactor/functions
Modified Files:
CopyBookMadeTest.java
Log Message:
added some functions to make jsps simpler
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/functions
Index: CopyBookMadeTest.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/functions/CopyBookMadeTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CopyBookMadeTest.java 17 Nov 2008 15:24:40 - 1.6
+++ CopyBookMadeTest.java 20 Nov 2008 15:09:40 - 1.7
@@ -11,7 +11,7 @@
* Retrieves a 'madetests' object for a certain tests and copybook objects.
*
* @author Michiel Meeuwissen
- * @version $Id: CopyBookMadeTest.java,v 1.6 2008/11/17 15:24:40 michiel Exp $
+ * @version $Id: CopyBookMadeTest.java,v 1.7 2008/11/20 15:09:40 michiel Exp $
*/
public class CopyBookMadeTest {
protected final static Logger log =
Logging.getLoggerInstance(CopyBookMadeTest.class);
@@ -58,6 +58,10 @@
return set;
}
+protected Node getMadeTestHolder(Node test) {
+return test.getFunctionValue("madetestholder", null).toNode();
+}
+
public NodeList madetests() {
Cloud cloud = node.getCloud();
@@ -66,7 +70,7 @@
if (test != null) {
Step testStep =
query.addRelationStep(cloud.getNodeManager("learnobjects"), "related",
"source").getNext();
StepField numberField = query.createStepField(testStep, "number");
-Queries.addConstraint(query, query.createConstraint(numberField,
test));
+Queries.addConstraint(query, query.createConstraint(numberField,
getMadeTestHolder(test)));
Queries.addConstraint(query,
query.createConstraint(query.createStepField(testStep, "otype"),
getOTypes(cloud, true, NODEMANAGERS)));
query.addSortOrder(numberField, SortOrder.ORDER_ASCENDING);
}
@@ -78,6 +82,7 @@
}
public Node madetest() {
+if (test == null) throw new IllegalArgumentException("Test parameter
is required");
NodeList found = madetests();
if (found.size() > 0) {
@@ -99,7 +104,7 @@
Relation rel1 = rm.createRelation(node, madeTest);
rel1.commit();
RelationManager rm2 = cloud.getRelationManager(node.getNodeManager(),
madeTests, "related");
-Relation rel2 = rm2.createRelation(test, madeTest);
+Relation rel2 = rm2.createRelation(getMadeTestHolder(test), madeTest);
rel2.commit();
return madeTest;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/filter ProviderFilter.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter
In directory james.mmbase.org:/tmp/cvs-serv14970/core/java/nl/didactor/filter
Modified Files:
ProviderFilter.java
Log Message:
added some functions to make jsps simpler
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/filter
Index: ProviderFilter.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter/ProviderFilter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- ProviderFilter.java 20 Nov 2008 09:11:22 - 1.23
+++ ProviderFilter.java 20 Nov 2008 15:09:40 - 1.24
@@ -34,7 +34,7 @@
* Request scope vars are 'provider', 'education', 'class'.
*
* @author Michiel Meeuwissen
- * @version $Id: ProviderFilter.java,v 1.23 2008/11/20 09:11:22 michiel Exp $
+ * @version $Id: ProviderFilter.java,v 1.24 2008/11/20 15:09:40 michiel Exp $
*/
public class ProviderFilter implements Filter, MMBaseStarter,
NodeEventListener, RelationEventListener {
private static final Logger log =
Logging.getLoggerInstance(ProviderFilter.class);
@@ -493,7 +493,7 @@
params.set("education", education);
Node claz = (Node) fun.getFunctionValue(params);
userAttributes.put("class", claz == null ? null :
claz.getNumber());
-log.debug("Found " + (claz == null ? "NULL" :
claz.getNumber()) + " for user " + (user == null ? "NULL" : user.getNumber()) +
" and educcation " + (education == null ? "NULL" : education));
+log.debug("Found " + (claz == null ? "NULL" :
claz.getNumber()) + " for user " + (user == null ? "NULL" : user.getNumber()) +
" and education " + (education == null ? "NULL" : education));
} catch (NotFoundException nfe) {
log.warn(nfe);
// never mind
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor/functions - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/functions In directory james.mmbase.org:/tmp/cvs-serv14870/functions Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/functions added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor/functions ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/metainf/tags/di/core question.tagx
Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core In directory james.mmbase.org:/tmp/cvs-serv11836 Modified Files: question.tagx Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core Index: question.tagx === RCS file: /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/question.tagx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- question.tagx 13 Nov 2008 12:18:13 - 1.4 +++ question.tagx 20 Nov 2008 12:15:42 - 1.5 @@ -9,12 +9,12 @@ name-given="answernode" variable-class="org.mmbase.bridge.Node" /> - - -1 + + - + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/searchrelate/templates List.js.jsp
Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv11238
Modified Files:
List.js.jsp
Log Message:
increased performance by removing some recursion
See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates
Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- List.js.jsp 20 Nov 2008 09:33:18 - 1.34
+++ List.js.jsp 20 Nov 2008 11:47:38 - 1.35
@@ -17,7 +17,7 @@
* - mmsrCreated
*
* @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.34 2008/11/20 09:33:18 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.35 2008/11/20 11:47:38 michiel Exp $
*/
@@ -43,7 +43,7 @@
this.callBack = null; // called on delete and create
-var listinfos = this.findByClass(this.div, "listinfo");
+var listinfos = this.find("listinfo");
this.type = listinfos.find("input[name = 'type']")[0].value;
this.item = listinfos.find("input[name = 'item']")[0].value;
@@ -71,12 +71,11 @@
self.commit();
});
-this.find(this.div, "a.create").each(function() {
-if ($(this).parents(".list")[0] == self.div) {
+this.find("create", "a").each(function() {
self.bindCreate(this);
-}
});
-this.find(this.div, "a.delete").each(function() {
+
+this.find("delete", "a").each(function() {
self.bindDelete(this);
});
@@ -101,45 +100,51 @@
List.prototype.leftPage = false;
-/**
- * Finds all elements with given node name and class, but ignores everything
in a child div.list.
- */
-List.prototype.find = function(el, selector, result) {
-if (result == null) {
-result = [];
-}
+
+List.prototype.find = function(clazz, elname) {
+var result = [];
var self = this;
-var childNodes = el.childNodes;
-for (var i = 0; i < childNodes.length; i++) {
-var childNode = childNodes[i];
-var cn = childNode.nodeName.toUpperCase();
-if (cn == '#TEXT' || cn == 'OPTION' || (cn == 'DIV' &&
$(childNode).hasClass("list"))) {
+if (elname != null) elname = elname.toUpperCase();
-} else {
-if ($(childNode).filter(selector).length > 0) {
-result[result.length] = childNode;
+var t = this.div.firstChild;
+while (t != null) {
+var cn = t.nodeName.toUpperCase();
+if (cn == '#TEXT' || (cn == 'DIV' && $(t).hasClass("list"))) {
+var c = t.nextSibling;
+while (c == null) {
+t = t.parentNode;
+if (t == self.div) { c = null; break; }
+c = t.nextSibling;
}
-self.find(childNode, selector, result);
-}
-}
-return $(result);
-}
-List.prototype.findByClass = function(el, clazz, result) {
-if (result == null) {
-result = [];
+t = c;
+
+} else {
+if ( (clazz == null || $(t).hasClass(clazz)) &&
+ (elname == null || cn == elname)) {
+result[result.length] = t;
+var c = t.nextSibling;
+while (c == null) {
+t = t.parentNode;
+if (t == self.div) { c = null; break; }
+c = t.nextSibling;
}
-var self = this;
-var childNodes = el.childNodes;
-for (var i = 0; i < childNodes.length; i++) {
-var childNode = childNodes[i];
-var cn = childNode.nodeName;
-if (cn == '#text' || cn== 'option' || (cn == 'div' &&
$(childNode).hasClass("list"))) {
+t = c;
} else {
-if ($(childNode).hasClass(clazz)) {
-result[result.length] = childNode;
+var c = t.firstChild;
+if (c == null) {
+c = t.nextSibling;
+}
+if (c == null) {
+c = t.nextSibling;
+while (c == null) {
+t = t.parentNode;
+if (t == self.div) { c = null; break; }
+c = t.nextSibling;
+}
+}
+t = c;
}
-self.findByClass(childNode, clazz, result);
}
}
return $(result);
@@ -188,12 +193,12 @@
a.list.validator.validateElement(this);
});
if (params.createpos == 'top') {
-a.list.find(a.list.div, "ol").prepend(r);
+a.list.find(null, "ol").prepend(r);
} else {
-a.list.find(a.list.div, "ol").append(r);
+a.list.find(null, "ol").append(r);
[MMBASE CVS] applications/searchrelate/templates List.js.jsp
Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv8818
Modified Files:
List.js.jsp
Log Message:
only bind create if this a is indeed belonging to the correct
mm-sr:relatednodes. (in case of nesting)
See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates
Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- List.js.jsp 30 Oct 2008 15:21:58 - 1.33
+++ List.js.jsp 20 Nov 2008 09:33:18 - 1.34
@@ -17,7 +17,7 @@
* - mmsrCreated
*
* @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.33 2008/10/30 15:21:58 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.34 2008/11/20 09:33:18 michiel Exp $
*/
@@ -72,7 +72,9 @@
});
this.find(this.div, "a.create").each(function() {
+if ($(this).parents(".list")[0] == self.div) {
self.bindCreate(this);
+}
});
this.find(this.div, "a.delete").each(function() {
self.bindDelete(this);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms MoveAssetToChannelAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv8065/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
MoveAssetToChannelAction.java
Log Message:
CMSC-681 change Assets display in two ways. list and thumbnails.
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-681
Index: MoveAssetToChannelAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MoveAssetToChannelAction.java 11 Nov 2008 05:56:54 - 1.1
+++ MoveAssetToChannelAction.java 20 Nov 2008 08:53:48 - 1.2
@@ -94,7 +94,7 @@
else {
message = resources.getMessage(locale, "asset.movetochannel.failed",
newChannelNode.getStringValue("name"));
}
- String path = mapping.findForward(SUCCESS).getPath() + "?" +
PARAMETER_CHANNEL + "=" + channel;
+ String path = mapping.findForward(SUCCESS).getPath() + "?type=asset&" +
PARAMETER_CHANNEL + "=" + channel;
if(StringUtils.isNotEmpty(offset)) {
path += "&offset="+offset;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/filter ProviderFilter.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter
In directory james.mmbase.org:/tmp/cvs-serv8467
Modified Files:
ProviderFilter.java
Log Message:
lowered log, fixed possible NPE
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/filter
Index: ProviderFilter.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter/ProviderFilter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ProviderFilter.java 17 Nov 2008 14:32:03 - 1.22
+++ ProviderFilter.java 20 Nov 2008 09:11:22 - 1.23
@@ -34,7 +34,7 @@
* Request scope vars are 'provider', 'education', 'class'.
*
* @author Michiel Meeuwissen
- * @version $Id: ProviderFilter.java,v 1.22 2008/11/17 14:32:03 michiel Exp $
+ * @version $Id: ProviderFilter.java,v 1.23 2008/11/20 09:11:22 michiel Exp $
*/
public class ProviderFilter implements Filter, MMBaseStarter,
NodeEventListener, RelationEventListener {
private static final Logger log =
Logging.getLoggerInstance(ProviderFilter.class);
@@ -493,7 +493,7 @@
params.set("education", education);
Node claz = (Node) fun.getFunctionValue(params);
userAttributes.put("class", claz == null ? null :
claz.getNumber());
-log.info("Found " + claz.getNumber() + " for user " +
user.getNumber() + " and educcation " + education);
+log.debug("Found " + (claz == null ? "NULL" :
claz.getNumber()) + " for user " + (user == null ? "NULL" : user.getNumber()) +
" and educcation " + (education == null ? "NULL" : education));
} catch (NotFoundException nfe) {
log.warn(nfe);
// never mind
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository asset.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv8310
Modified Files:
asset.jsp
Log Message:
CMSC-1089 Change Assets display in two ways. list and thumbnails. Create
url/edit url/preview/show info
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1089
Index: asset.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- asset.jsp 20 Nov 2008 08:55:29 - 1.10
+++ asset.jsp 20 Nov 2008 09:02:19 - 1.11
@@ -59,7 +59,7 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
-
+
"/>
@@ -157,7 +157,11 @@
+
+
+
+
${fn:substring(title,0,49)}...
${title}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository asset.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv8137 Modified Files: asset.jsp Log Message: CMSC-1089(Improve the showing of images. ) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository See also: http://www.mmbase.org/jira/browse/CMSC-1089 Index: asset.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- asset.jsp 11 Nov 2008 02:24:20 - 1.9 +++ asset.jsp 20 Nov 2008 08:55:29 - 1.10 @@ -223,43 +223,43 @@ - - - + + + <%@ include file="icons.jspf" %> - + )"> - - + + " alt=""/> - + change - + need to add - - + + - + need to change - + need to add - + <%@ include file="../pages.jsp" %> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
