Author: keith
Date: Tue Jan 15 20:51:21 2008
New Revision: 12301
Log:
Updating queries to query for active mashups. (We have to exclude deleted
mashups). Fix for Mashup-496.
Modified:
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
Modified:
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
==============================================================================
---
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
(original)
+++
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
Tue Jan 15 20:51:21 2008
@@ -733,7 +733,7 @@
addQuery(
registry,
MashupConstants.ALL_MASHUPS_QUERY_PATH,
- "SELECT PATH FROM ARTIFACTS WHERE MEDIA_TYPE='" +
MashupConstants
+ "SELECT PATH FROM ARTIFACTS WHERE STATE=100 AND
MEDIA_TYPE='" + MashupConstants
.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -742,7 +742,7 @@
addQuery(
registry,
MashupConstants.MY_MASHUPS_QUERY_PATH,
- "SELECT PATH FROM ARTIFACTS WHERE AUTHOR=? AND
MEDIA_TYPE='" +
+ "SELECT PATH FROM ARTIFACTS WHERE STATE=100 AND
AUTHOR=? AND MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -751,7 +751,7 @@
addQuery(
registry,
MashupConstants.TOP_MASHUPS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.AID=R.AID AND A.MEDIA_TYPE='" +
+ "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.STATE=100 AND A.AID=R.AID AND A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' GROUP BY A.PATH HAVING AVG(R.RATING) >= 4.0
ORDER BY AVG(R.RATING) DESC",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -761,7 +761,7 @@
addQuery(
registry,
MashupConstants.MY_TOP_MASHUPS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.AID=R.AID AND A.AUTHOR=? AND A.MEDIA_TYPE='" +
+ "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.STATE=100 AND A.AID=R.AID AND A.AUTHOR=? AND A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' GROUP BY A.PATH HAVING AVG(R.RATING) >= 4.0
ORDER BY AVG(R.RATING) DESC",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -792,7 +792,7 @@
addQuery(
registry,
MashupConstants.USER_TAGS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, TAGS T WHERE A.PATH=?
AND T.TAG_NAME=? AND T.AID=A.AID AND T.USER_ID=? AND A.MEDIA_TYPE='" +
+ "SELECT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND A.PATH=? AND T.TAG_NAME=? AND T.AID=A.AID AND T.USER_ID=? AND
A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -802,7 +802,7 @@
addQuery(
registry,
MashupConstants.CUSTOM_QUERY_PATH,
- "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
(A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR (T.TAG_NAME=? AND T.AID=A.AID)) AND
A.MEDIA_TYPE='" +
+ "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND (A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR (T.TAG_NAME=? AND
T.AID=A.AID)) AND A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -812,7 +812,7 @@
addQuery(
registry,
MashupConstants.MY_CUSTOM_QUERY_PATH,
- "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
(A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR (T.TAG_NAME=? AND T.AID=A.AID)) AND
A.AUTHOR=? AND A.MEDIA_TYPE='" +
+ "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND (A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR (T.TAG_NAME=? AND
T.AID=A.AID)) AND A.AUTHOR=? AND A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -821,7 +821,7 @@
addQuery(
registry,
MashupConstants.COMMENTS_QUERY_PATH,
- "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE
C.COMMENT_TEXT LIKE ? AND C.AID=A.AID AND A.MEDIA_TYPE='" +
+ "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE
C.COMMENT_TEXT LIKE ? AND C.AID=A.AID A.STATE=100 AND AND A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.COMMENTS_RESULT_TYPE
);
@@ -830,7 +830,7 @@
addQuery(
registry,
MashupConstants.MY_COMMENTS_QUERY_PATH,
- "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE
C.COMMENT_TEXT LIKE ? AND C.USER_ID=? AND C.AID=A.AID AND A.MEDIA_TYPE='" +
+ "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE
C.COMMENT_TEXT LIKE ? AND C.USER_ID=? AND C.AID=A.AID A.STATE=100 AND AND
A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "'",
RegistryConstants.COMMENTS_RESULT_TYPE
);
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
