r1219 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-publication/src/main/resources/filters-properties wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action - Wikitty-commits

30 Aug 2011

Author: mfortun
Date: 2011-08-30 18:10:04 +0200 (Tue, 30 Aug 2011)
New Revision: 1219

Url: http://nuiton.org/repositories/revision/wikitty/1219

Log:
*correct doc
*correct criteria for contextapps

Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java
   trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java
   trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java
   trunk/wikitty-publication/src/main/resources/filters-properties/README.txt
   trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java	2011-08-30 15:26:02 UTC (rev 1218)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java	2011-08-30 16:10:04 UTC (rev 1219)
@@ -61,7 +61,7 @@
     static public ScriptEngineManager getScriptEnginManager(ClassLoader classLoader) {
         ScriptEngineManager result;
         if (classLoader != null) {
-            result = new ScriptEngineManager();
+            result = new ScriptEngineManager(classLoader);
         } else {
             if (scriptEnginManager == null) {
                 // create default ScriptEngineManager
@@ -84,6 +84,7 @@
             String name, String mimetype) {
         ScriptEngineManager scriptEnginManager = getScriptEnginManager(classLoader);
         ScriptEngine scriptEngin = scriptEnginManager.getEngineByMimeType(mimetype);
+        
         if (scriptEngin == null) {
             List<ScriptEngineFactory> factories =
                     scriptEnginManager.getEngineFactories();

Modified: trunk/wikitty-publication/src/main/resources/filters-properties/README.txt
===================================================================
--- trunk/wikitty-publication/src/main/resources/filters-properties/README.txt	2011-08-30 15:26:02 UTC (rev 1218)
+++ trunk/wikitty-publication/src/main/resources/filters-properties/README.txt	2011-08-30 16:10:04 UTC (rev 1219)
@@ -16,11 +16,9 @@
 ClosingWriterChar: string after write string and before String delim
 OpeningWriterChar: string after string delim, before ending car
 ClosingTemplate: string that close the template
-MimeType: the mime type of the wikittyPubText after decoration
 Key: mimetype special usualy originMime.targetMime for example html.javascript
-this is linked to mimetype properties 
-ContentType: content type set for the result of the evaluation of this
-wikitty pub text
+this is linked to mimetype properties. Pattern [xxx.yyy]
+
  
 Example :
 
@@ -33,7 +31,7 @@
 </html>
 with template:
 
-wpContext.setContentType("[ContentType]")[EndingCar]
+wpContext.setContentType("text/[xxx]")[EndingCar]
 
 [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar]	
 [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar]
@@ -41,7 +39,7 @@
 [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate]
 	
 This filters will be enable when try to evaluate wikittyPubText with mime type:
-text/[Key], the mime type of the wikittyPubText after will be: [MimeType]
+text/[xxx.yyy], the mime type of the wikittyPubText after will be: text/[yyy]
 
 
 If using the default filters: 
@@ -68,6 +66,5 @@
 ClosingWriterChar=
 OpeningWriterChar=
 ClosingTemplate=
-MimeType=
 Key=
-ContentType=
+

Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties
===================================================================
--- trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties	2011-08-30 15:26:02 UTC (rev 1218)
+++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties	2011-08-30 16:10:04 UTC (rev 1219)
@@ -30,6 +30,4 @@
 ClosingWriterChar=
 OpeningWriterChar=+=
 ClosingTemplate=";
-MimeType=application\/javascript
 Key=html.javascript
-ContentType=text\/html; charset=UTF-8
\ No newline at end of file

Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java
===================================================================
--- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java	2011-08-30 15:26:02 UTC (rev 1218)
+++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java	2011-08-30 16:10:04 UTC (rev 1219)
@@ -253,7 +253,7 @@
                  * wikitty is wikitty pub data do the same as raw action
                  */
 
-                if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
+                if (w != null && w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
 
                     contentType = WikittyPubDataHelper.getMimeType(w);
 

Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java
===================================================================
--- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java	2011-08-30 15:26:02 UTC (rev 1218)
+++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java	2011-08-30 16:10:04 UTC (rev 1219)
@@ -132,19 +132,22 @@
                 // WikittyPubText.name et WikittyPubData.name
               
                 if (contextApps != null){
+                   
+                    Search mainRequest = Search.query();
+                    Search subRoqu = mainRequest.or();
+                    subRoqu.eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME,
+                                    searchString)
+                            .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME,
+                                    searchString).criteria(searchString);
                     
+                    
+                    
                    // Search for wikitty pubdata or pub text with the name
                    // and their  
-                    result = Search
-                            .query()
+                    result = mainRequest
                             .exteq(WikittyLabel.EXT_WIKITTYLABEL)
                             .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS,
-                                    contextApps)
-                            .or()
-                            .eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME,
-                                    searchString)
-                            .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME,
-                                    searchString).criteria(searchString);
+                                    contextApps).criteria();
                     
                     
                 }else{

    

r1219 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-publication/src/main/resources/filters-properties wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action

mfortun＠users.nuiton.org

tags

participants (1)