From mfortun@users.nuiton.org Tue Aug 30 18:10:04 2011 From: mfortun@users.nuiton.org To: wikitty-commits@list.nuiton.org Subject: [Wikitty-commits] 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 Date: Tue, 30 Aug 2011 18:10:04 +0200 Message-ID: <20110830161004.9D0005AAA9@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2319401175398758648==" --===============2319401175398758648== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-de= fault.properties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2= 011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2= 011-08-30 16:10:04 UTC (rev 1219) @@ -61,7 +61,7 @@ static public ScriptEngineManager getScriptEnginManager(ClassLoader clas= sLoader) { ScriptEngineManager result; if (classLoader !=3D null) { - result =3D new ScriptEngineManager(); + result =3D new ScriptEngineManager(classLoader); } else { if (scriptEnginManager =3D=3D null) { // create default ScriptEngineManager @@ -84,6 +84,7 @@ String name, String mimetype) { ScriptEngineManager scriptEnginManager =3D getScriptEnginManager(cla= ssLoader); ScriptEngine scriptEngin =3D scriptEnginManager.getEngineByMimeType(= mimetype); + =20 if (scriptEngin =3D=3D null) { List factories =3D scriptEnginManager.getEngineFactories(); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/REA= DME.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wikitty-publication/src/main/resources/filters-properties/README.tx= t 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/README.tx= t 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.javascri= pt -this is linked to mimetype properties=20 -ContentType: content type set for the result of the evaluation of this -wikitty pub text +this is linked to mimetype properties. Pattern [xxx.yyy] + =20 Example : =20 @@ -33,7 +31,7 @@ with template: =20 -wpContext.setContentType("[ContentType]")[EndingCar] +wpContext.setContentType("text/[xxx]")[EndingCar] =20 [OpeningTemplate][StringDelim][ClosingWriterChar][EndingCar]=09 [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterC= har][EndingCar] @@ -41,7 +39,7 @@ [WriteString][OpeningWriterChar][StringDelim][StringDelim][ClosingWri= terChar][EndingCar][ClosingTemplate] =09 This filters will be enable when try to evaluate wikittyPubText with mime ty= pe: -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] =20 =20 If using the default filters:=20 @@ -68,6 +66,5 @@ ClosingWriterChar=3D OpeningWriterChar=3D ClosingTemplate=3D -MimeType=3D Key=3D -ContentType=3D + Modified: trunk/wikitty-publication/src/main/resources/filters-properties/fil= ters-default.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-d= efault.properties 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-d= efault.properties 2011-08-30 16:10:04 UTC (rev 1219) @@ -30,6 +30,4 @@ ClosingWriterChar=3D OpeningWriterChar=3D+=3D ClosingTemplate=3D"; -MimeType=3Dapplication\/javascript Key=3Dhtml.javascript -ContentType=3Dtext\/html; charset=3DUTF-8 \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publi= cation/ui/action/PublicationActionEval.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 */ =20 - if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + if (w !=3D null && w.hasExtension(WikittyPubData.EXT_WIKITTY= PUBDATA)) { =20 contentType =3D WikittyPubDataHelper.getMimeType(w); =20 Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publi= cation/ui/action/PublicationBaseAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =20 if (contextApps !=3D null){ + =20 + Search mainRequest =3D Search.query(); + Search subRoqu =3D mainRequest.or(); + subRoqu.eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, + searchString) + .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, + searchString).criteria(searchString); =20 + =20 + =20 // Search for wikitty pubdata or pub text with the name // and their =20 - result =3D Search - .query() + result =3D 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(); =20 =20 }else{ --===============2319401175398758648==--