From bpoussin@users.nuiton.org Wed Dec 8 05:22:46 2010
From: bpoussin@users.nuiton.org
To: wikitty-commits@list.nuiton.org
Subject: [Wikitty-commits] r576 -
trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
Date: Wed, 08 Dec 2010 05:22:46 +0100
Message-ID: <20101208042246.DFF3D15C96@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6356014917203235264=="
--===============6356014917203235264==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: bpoussin
Date: 2010-12-08 05:22:46 +0100 (Wed, 08 Dec 2010)
New Revision: 576
Url: http://nuiton.org/repositories/revision/wikitty/576
Log:
simplify url for WikittyPub(Data|Text)
Modified:
trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/Act=
ionRaw.java
Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publicat=
ion/ActionRaw.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/src/main/java/org/nuiton/wikitty/publication/Ac=
tionRaw.java 2010-12-07 16:21:53 UTC (rev 575)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/Ac=
tionRaw.java 2010-12-08 04:22:46 UTC (rev 576)
@@ -6,6 +6,10 @@
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.entities.Wikitty;
import org.nuiton.wikitty.entities.WikittyExtension;
+import org.nuiton.wikitty.publication.entities.WikittyPubData;
+import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper;
+import org.nuiton.wikitty.publication.entities.WikittyPubText;
+import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.search.Search;
=20
@@ -14,7 +18,7 @@
* Elle peut-etre utilisee pour retourner une image ou un document stocke da=
ns
* un champs d'un wikitty
*
- * Cette action prend deux arguments obligatoires
+ * Cette action prend deux arguments obligatoires (si pas WikittyPub(Text|Da=
ta)
* l'argument de recherche du wikitty
* le champs qu'il faut retourner en raw
*=20
@@ -23,7 +27,10 @@
*
* exemple
*
+ * ram/WikittyPubData.name=3DMonImage.jpg
+ * ram/WikittyPubText.name=3DTuto
* ram/WikittyPubData.name=3DMonImage.jpg/WikittyPubData.content?mimetype=3D=
WikittyPubData.mimetype
+ * ram/WikittyPubData.name=3DMonImage.jpg/WikittyPubData.mimetype?mimetype=
=3Dtext/plain
* ram/WikittyPubText.name=3DTuto/WikittyPubText.content?mimetype=3DWikittyP=
ubText.mimetype
* ram/WikittyUser.login=3Dadmin/WikittyUser.password?mimetype=3Dtext/plain
*
@@ -59,7 +66,9 @@
WikittyProxy proxy =3D context.getWikittyProxy();
=20
Object result =3D "no query";
- if (context.getMandatoryArguments().size() < 2) {
+ if (context.getMandatoryArguments().size() < 1 ||
+ (context.getMandatoryArguments().size() < 2
+ && !context.getMandatoryArguments().get(ARG_QUERY).startsWith=
("WikittyPub")) ) {
context.setContentType("text/html");
result =3D String.format(""
+ "bad query
"
@@ -90,8 +99,19 @@
}
}
context.setContentType(mimetype);
+ } else if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)=
) {
+ mimetype =3D WikittyPubTextHelper.getMimeType(w);
+ } else if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)=
) {
+ mimetype =3D WikittyPubDataHelper.getMimeType(w);
}
- String contentField =3D context.getMandatoryArguments().get(=
ARG_CONTENT_FIELD);
+ String contentField =3D null;
+ if (context.getMandatoryArguments().size() >=3D 2) {
+ contentField =3D context.getMandatoryArguments().get(ARG=
_CONTENT_FIELD);
+ } else if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)=
) {
+ contentField =3D WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_=
CONTENT;
+ } else if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)=
) {
+ contentField =3D WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_=
CONTENT;
+ }
String extName =3D WikittyExtension.extractExtensionName(con=
tentField);
String fieldName =3D WikittyExtension.extractFieldName(conte=
ntField);
=20
--===============6356014917203235264==--