Author: keith
Date: Wed Apr 23 05:26:53 2008
New Revision: 16058
Log:
Fixing some SQLs due to registry changes
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
Wed Apr 23 05:26:53 2008
@@ -1130,7 +1130,7 @@
addQuery(
systemRegistry,
MashupConstants.ALL_MASHUPS_QUERY_PATH,
- "SELECT PATH FROM ARTIFACTS WHERE STATE=100 AND
(MEDIA_TYPE='" +
+ "SELECT PATH FROM RESOURCE WHERE (MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "' OR " +
"MEDIA_TYPE='wso2_data_service') ORDER BY
LAST_UPDATED_TIME DESC",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -1140,7 +1140,7 @@
addQuery(
systemRegistry,
MashupConstants.MY_MASHUPS_QUERY_PATH,
- "SELECT PATH FROM ARTIFACTS WHERE STATE=100 AND
AUTHOR=? AND " +
+ "SELECT PATH FROM RESOURCE WHERE CREATOR=? AND " +
"(MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "' OR " +
"MEDIA_TYPE='wso2_data_service') ORDER BY
LAST_UPDATED_TIME DESC",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -1150,7 +1150,7 @@
addQuery(
systemRegistry,
MashupConstants.TOP_MASHUPS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.STATE=100 AND " +
+ "SELECT A.PATH FROM RESOURCE A, RATINGS R WHERE " +
"A.AID=R.AID AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "' OR " +
"A.MEDIA_TYPE='wso2_data_service') GROUP BY
A.PATH HAVING " +
@@ -1162,8 +1162,8 @@
addQuery(
systemRegistry,
MashupConstants.MY_TOP_MASHUPS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, RATINGS R WHERE
A.STATE=100 AND " +
- "A.AID=R.AID AND A.AUTHOR=? AND
(A.MEDIA_TYPE='" +
+ "SELECT A.PATH FROM RESOURCE A, RATINGS R WHERE " +
+ "A.AID=R.AID AND A.CREATOR=? AND
(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE + "' OR " +
"A.MEDIA_TYPE='wso2_data_service') GROUP BY
A.PATH HAVING " +
"AVG(R.RATING) >= 4.0 ORDER BY AVG(R.RATING)
DESC",
@@ -1196,7 +1196,7 @@
addQuery(
systemRegistry,
MashupConstants.USER_TAGS_QUERY_PATH,
- "SELECT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND A.PATH=? " +
+ "SELECT A.PATH FROM RESOURCE A, TAGS T WHERE A.PATH=?
" +
"AND T.TAG_NAME=? AND T.AID=A.AID AND
T.USER_ID=? AND " +
"(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
@@ -1208,7 +1208,7 @@
addQuery(
systemRegistry,
MashupConstants.CUSTOM_QUERY_PATH,
- "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND " +
+ "SELECT DISTINCT A.PATH FROM RESOURCE A, TAGS T WHERE
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 +
"' OR A.MEDIA_TYPE='wso2_data_service')",
@@ -1220,9 +1220,9 @@
addQuery(
systemRegistry,
MashupConstants.MY_CUSTOM_QUERY_PATH,
- "SELECT DISTINCT A.PATH FROM ARTIFACTS A, TAGS T WHERE
A.STATE=100 AND " +
+ "SELECT DISTINCT A.PATH FROM RESOURCE A, TAGS T WHERE
AND " +
"(A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR
(T.TAG_NAME=? AND " +
- "T.AID=A.AID)) AND A.AUTHOR=? AND
(A.MEDIA_TYPE='" +
+ "T.AID=A.AID)) AND A.CREATOR=? AND
(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -1232,8 +1232,8 @@
addQuery(
systemRegistry,
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.STATE=100 AND
(A.MEDIA_TYPE='" +
+ "SELECT C.CM_ID FROM COMMENTS C, RESOURCE A WHERE
C.COMMENT_TEXT " +
+ "LIKE ? AND C.AID=A.AID AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
@@ -1243,8 +1243,8 @@
addQuery(
systemRegistry,
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.STATE=100 AND " +
+ "SELECT C.CM_ID FROM COMMENTS C, RESOURCE A WHERE
C.COMMENT_TEXT " +
+ "LIKE ? AND C.USER_ID=? AND C.AID=A.AID AND " +
"(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
@@ -1254,8 +1254,8 @@
addQuery(
systemRegistry,
MashupConstants.USERS_COMMENTS_QUERY_PATH,
- "SELECT C.CM_ID FROM COMMENTS C, ARTIFACTS A WHERE
C.USER_ID=? AND " +
- "C.AID=A.AID AND A.STATE=100 AND
(A.MEDIA_TYPE='" +
+ "SELECT C.CM_ID FROM COMMENTS C, RESOURCE A WHERE
C.USER_ID=? AND " +
+ "C.AID=A.AID AND AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
