[Yanel-commits] rev 29333 - public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend

[michi at wyona.com]

Author: michi
Date: 2007-11-28 23:02:40 +0100 (Wed, 28 Nov 2007)
New Revision: 29333

Modified:
   public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java
Log:
obsolete stuff removed and search added

Modified: public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java	2007-11-28 22:01:56 UTC (rev 29332)
+++ public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java	2007-11-28 22:02:40 UTC (rev 29333)
@@ -69,37 +69,42 @@
     public View getView(String viewId) throws Exception {
         StringBuffer sb = new StringBuffer("<foaf xmlns=\"http://www.wyona.org/foaf/1.0\">");
         String qs = getRequest().getParameter("q");
+        if (qs != null) {
+
+        // Results from Google, Facebook, ...
         try {
             ResultSet resultSet = getSearchResults(qs.replaceAll(" ", "+") + "+FOAF");
 
-        if (resultSet != null && resultSet.size() > 0) {
-            sb.append("<provider source-name=\"" + resultSet.getSourceName() + "\" source-domain=\"" + resultSet.getSourceDomain() + "\" numberOfResults=\"" + resultSet.size() + "\">");
-            for (int k = 0;k < resultSet.size(); k++) {
-                java.net.URL url = resultSet.get(k).url;
-                if (url.toString().endsWith("rdf")) {
-                    sb.append("<result number=\"" + (k+1) + "\" source-name=\"" + resultSet.getSourceName() + "\">");
-                    sb.append("<title><![CDATA[" + resultSet.get(k).title + "]]></title>");
-                    sb.append("<excerpt><![CDATA[" + resultSet.get(k).excerpt + "]]></excerpt>");
-                    sb.append("<url><![CDATA[" + resultSet.get(k).url + "]]></url>");
-                    sb.append("<last-modified><![CDATA[" + resultSet.get(k).lastModified + "]]></last-modified>");
-                    sb.append("<mime-type suffix=\"rdf\">application/rdf+xml</mime-type>");
-                    sb.append("</result>");
-                } else {
-                    log.warn("DEBUG: Does not seem to be a RDF: " + url);
+            if (resultSet != null && resultSet.size() > 0) {
+                sb.append("<provider source-name=\"" + resultSet.getSourceName() + "\" source-domain=\"" + resultSet.getSourceDomain() + "\" numberOfResults=\"" + resultSet.size() + "\">");
+                for (int k = 0;k < resultSet.size(); k++) {
+                    java.net.URL url = resultSet.get(k).url;
+                    if (url.toString().endsWith("rdf")) {
+                        sb.append("<result number=\"" + (k+1) + "\" source-name=\"" + resultSet.getSourceName() + "\">");
+                        sb.append("<title><![CDATA[" + resultSet.get(k).title + "]]></title>");
+                        sb.append("<excerpt><![CDATA[" + resultSet.get(k).excerpt + "]]></excerpt>");
+                        sb.append("<url><![CDATA[" + resultSet.get(k).url + "]]></url>");
+                        sb.append("<last-modified><![CDATA[" + resultSet.get(k).lastModified + "]]></last-modified>");
+                        sb.append("<mime-type suffix=\"rdf\">application/rdf+xml</mime-type>");
+                        sb.append("</result>");
+                    } else {
+                        log.warn("DEBUG: Does not seem to be a RDF: " + url);
+                    }
                 }
+                sb.append("</provider>");
             }
-            sb.append("</provider>");
-        }
         } catch (Exception e) {
             sb.append("<exception>" + e.getMessage() + "</exception>");
         }
 
+        // Results from Wyona-FOAF
         // TODO: Remove hard-coded ...
-        if (qs != null) {
             sb.append("<provider source-name=\"" + "Wyona-FOAF" + "\" source-domain=\"" + "http://foaf.wyona.org" + "\" numberOfResults=\"" + "1" + "\">");
 
             Repository pRepo = getProfilesRepository();
-            Node[] pNodes = pRepo.getNode("/profiles").getNodes();
+            Node[] pNodes = pRepo.search(qs);
+            //Node[] pNodes = pRepo.getNode("/profiles").getNodes();
+            if (pNodes != null) {
             for (int i = 0; i < pNodes.length; i++) {
                 sb.append("<result number=\"" + "1" + "\" source-name=\"" + "Wyona-FOAF" + "\">");
                 sb.append("<title><![CDATA[" + "Foo Bar" + "]]></title>");
@@ -109,22 +114,15 @@
                 sb.append("<mime-type suffix=\"html\">application/xhtml+xml</mime-type>");
                 sb.append("</result>");
             }
+            } else {
+                sb.append("<no-results/>");
+            }
+
 /*
-            Nodes[] nodes = getRealm().getRepository().search(qs);
             Nodes[] nodes = getRealm().getRepository().searchProperty("firstname", firstname);
             Nodes[] nodes = getRealm().getRepository().searchProperty("lastname", lastname);
 */
 
-/*
-            sb.append("<result number=\"" + "1" + "\" source-name=\"" + "Wyona-FOAF" + "\">");
-            sb.append("<title><![CDATA[" + "Foo Bar" + "]]></title>");
-            sb.append("<excerpt><![CDATA[" + "About Foo Bar ..." + "]]></excerpt>");
-            sb.append("<url><![CDATA[" + "profiles/foo-bar.html" + "]]></url>");
-            sb.append("<last-modified><![CDATA[" + "null" + "]]></last-modified>");
-            sb.append("<mime-type suffix=\"html\">application/xhtml+xml</mime-type>");
-            sb.append("</result>");
-*/
-
             sb.append("</provider>");
         }