Author: hasan
Date: Thu Jan 7 13:47:51 2010
New Revision: 896878
URL: http://svn.apache.org/viewvc?rev=896878&view=rev
Log:
CLEREZZA-60: improved error handling in RemoteConceptProvider, fixed bug in
javascript, updated query suggestion for case insensitivity, removed unused
method in SimpleConceptProviderManager
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/manage-concept-providers-page.ssp
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/staticweb/scripts/concept-provider-manipulation.js
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java?rev=896878&r1=896877&r2=896878&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
Thu Jan 7 13:47:51 2010
@@ -18,6 +18,7 @@
*/
package org.apache.clerezza.platform.concept.core;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -100,12 +101,21 @@
os.write(param.getBytes());
os.close();
- final InputStream is = con.getInputStream();
- Graph parsedGraph =
Parser.getInstance().parse(is,
- SupportedFormat.RDF_XML);
- is.close();
- conceptCache.cache(searchTerm.toLowerCase(),
parsedGraph);
- return parsedGraph;
+ if (con.getResponseCode() < 400) {
+ final InputStream is =
con.getInputStream();
+ Graph parsedGraph =
Parser.getInstance().parse(is,
+
SupportedFormat.RDF_XML);
+ is.close();
+
conceptCache.cache(searchTerm.toLowerCase(), parsedGraph);
+ return parsedGraph;
+ } else {
+ final InputStream es =
con.getErrorStream();
+ ByteArrayOutputStream baos = new
ByteArrayOutputStream();
+ for (int ch = es.read(); ch != -1; ch =
es.read()) {
+ baos.write(ch);
+ }
+ throw new
RuntimeException(baos.toString());
+ }
} catch (ProtocolException ex) {
throw new RuntimeException(ex);
} catch (MalformedURLException ex) {
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java?rev=896878&r1=896877&r2=896878&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
Thu Jan 7 13:47:51 2010
@@ -311,8 +311,4 @@
public List<ConceptProvider> getConceptProviders() {
return conceptProviderList;
}
-
- MGraph getContentGraph() {
- return cgProvider.getContentGraph();
- }
}
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/manage-concept-providers-page.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/manage-concept-providers-page.ssp?rev=896878&r1=896877&r2=896878&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/manage-concept-providers-page.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/manage-concept-providers-page.ssp
Thu Jan 7 13:47:51 2010
@@ -1,5 +1,5 @@
def skos(s: Any) = new UriRef("http://www.w3.org/2008/05/skos#"+s)
-def cm(s: Any) = new UriRef("http://clerezza.org/2009/04/conceptmanager#"+s)
+def cpt(s: Any) = new UriRef("http://clerezza.org/2010/01/concept#"+s)
def lingvoj(s: Any) = new UriRef("http://www.lingvoj.org/ontology#"+s)
def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
def rdf(s: Any) = new UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
@@ -30,11 +30,11 @@
def createSelection(isLocal: Boolean) = <select name="types">
{if(isLocal) {
-
<option value={cm("LocalConceptProvider").getUnicodeString()}
selected="selected">LocalConceptProvider</option>
-
<option value={cm("RemoteConceptProvider").getUnicodeString()}
>RemoteConceptProvider</option>
+
<option value={cpt("LocalConceptProvider").getUnicodeString()}
selected="selected">LocalConceptProvider</option>
+
<option value={cpt("RemoteConceptProvider").getUnicodeString()}
>RemoteConceptProvider</option>
} else {
-
<option
value={cm("LocalConceptProvider").getUnicodeString()}>LocalConceptProvider</option>
-
<option value={cm("RemoteConceptProvider").getUnicodeString()}
selected="selected">RemoteConceptProvider</option>
+
<option
value={cpt("LocalConceptProvider").getUnicodeString()}>LocalConceptProvider</option>
+
<option value={cpt("RemoteConceptProvider").getUnicodeString()}
selected="selected">RemoteConceptProvider</option>
}}
</select>
@@ -42,7 +42,7 @@
resultDocModifier.addScriptReference("/jquery/jquery.tooltip.pack.js");
resultDocModifier.addScriptReference("/jquery/jquery.ajaxQueue.js");
resultDocModifier.addScriptReference("/jquery/jquery.autocomplete.min.js");
-resultDocModifier.addScriptReference("/admin/concept-manager/scripts/ajax-options.js");
+resultDocModifier.addScriptReference("/scripts/ajax-options.js");
resultDocModifier.addScriptReference("scripts/concept-provider-manipulation.js");
resultDocModifier.setTitle("Resource Tagging");
resultDocModifier.addNodes2Elem("tx-module", <h1>Resource Tagging</h1>);
@@ -66,9 +66,9 @@
<tbody>
{ for (provider <-
(res!!)) yield {
if((provider/rdf("type")*).indexOf("LocalConceptProvider") != -1) {
-
createProvider((provider/rdf("type")*), provider/cm("selectedScheme")*, "", "",
"")
+
createProvider((provider/rdf("type")*), provider/cpt("selectedScheme")*, "",
"", "")
} else {
-
createProvider((provider/rdf("type")*), "", provider/cm("sparqlEndPoint")*,
provider/cm("defaultGraph")*, provider/cm("queryTemplate")*)
+
createProvider((provider/rdf("type")*), "", provider/cpt("sparqlEndPoint")*,
provider/cpt("defaultGraph")*, provider/cpt("queryTemplate")*)
}
}
}
@@ -77,8 +77,8 @@
<td>
<div>Add
Concept Provider:</div>
<select
id="type">
- <option
value={cm("LocalConceptProvider").getUnicodeString()}>LocalConceptProvider</option>
- <option
value={cm("RemoteConceptProvider").getUnicodeString()}>RemoteConceptProvider</option>
+ <option
value={cpt("LocalConceptProvider").getUnicodeString()}>LocalConceptProvider</option>
+ <option
value={cpt("RemoteConceptProvider").getUnicodeString()}>RemoteConceptProvider</option>
</select>
<div>Concept
Scheme:</div>
<input
type="text" name="conceptScheme" id="conceptScheme"/>
@@ -100,5 +100,4 @@
</fieldset>
</form>
</div>
-
-</div>
\ No newline at end of file
+</div>
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/staticweb/scripts/concept-provider-manipulation.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/staticweb/scripts/concept-provider-manipulation.js?rev=896878&r1=896877&r2=896878&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/staticweb/scripts/concept-provider-manipulation.js
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/core/staticweb/scripts/concept-provider-manipulation.js
Thu Jan 7 13:47:51 2010
@@ -27,10 +27,9 @@
"CONSTRUCT { ?concept a skos08:Concept; skos08:prefLabel ?prefLabel; " +
"rdfs:comment ?comment; owl:sameAs ?sameConcept . } \n" +
"WHERE { ?concept a skos04:Concept; skos04:prefLabel ?prefLabel . \n" +
- "OPTIONAL { ?concept skos04:altLabel ?altLabel . } \n" +
"OPTIONAL { ?concept rdfs:comment ?comment . } \n" +
"OPTIONAL { ?concept owl:sameAs ?sameConcept . } \n" +
- "FILTER (REGEX(STR(?prefLabel), '${searchTerm}') ||
REGEX(STR(?altLabel), '${searchTerm}'))}";
+ "FILTER (REGEX(STR(?prefLabel), '${searchTerm}', 'i'))}";
ConceptProviderGui.initButtons = function() {
@@ -211,4 +210,4 @@
});
ConceptProviderGui.initButtons();
-});
\ No newline at end of file
+});
