[Yanel-commits] rev 21735 - public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-01-15 00:49:30 +0100 (Mon, 15 Jan 2007)
New Revision: 21735

Modified:
   public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
Log:
get language from RTI enabled

Modified: public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java	2007-01-14 23:48:57 UTC (rev 21734)
+++ public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java	2007-01-14 23:49:30 UTC (rev 21735)
@@ -87,7 +87,7 @@
     private long totalHits = 0;
     private String defaultFile = "nutch-default.xml";
     private String localFile = "nutch-local.xml";
-    private String defaultLanguage = "en";
+    private String DEFAULT_LANGUAGE = "en";
     private String searchTerm = "";
     private String show = ""; //default is empty, else show either CACHE, EXPLAIN, ANCHORS
     private String resourceBundle = "nutch";
@@ -115,7 +115,7 @@
      * 
      */
     public View getView(Path path, String viewId) {
-        return getView(path, viewId, 0, 0, defaultLanguage);
+        return getView(path, viewId, 0, 0, DEFAULT_LANGUAGE);
     }
 
     /**
@@ -166,20 +166,7 @@
             hitsPerPage = _hitsPerPage;
         }
 
-        String language = request.getParameter("yanel.meta.language");
-        if (language == null) {
-            language = request.getHeader("Accept-Language");
-            if (language != null) {
-                log.debug("Use Accept-Language from Request Header: " + language);
-                if (language.indexOf(",") > 0) {
-                    language = language.substring(0, language.indexOf(","));
-                }
-            }
-        }
-        if (language == null) {
-            language = defaultLanguage;
-        }
-        log.debug("Language: " + language);
+        String language = getLanguage();
 
         int idx = 0;
         try {
@@ -690,4 +677,32 @@
             e.printStackTrace();
         }  
     }
+
+    /**
+     * Get language
+     */
+    private String getLanguage() {
+        String language = getRTI().getProperty("language");
+
+        if (language == null) {
+	    language = getRequest().getParameter("yanel.meta.language");
+        }
+
+        if (language == null) {
+            language = getRequest().getHeader("Accept-Language");
+            if (language != null) {
+                log.debug("Use Accept-Language from Request Header: " + language);
+                if (language.indexOf(",") > 0) {
+                    language = language.substring(0, language.indexOf(","));
+                }
+            }
+        }
+
+        if (language == null) {
+            language = DEFAULT_LANGUAGE;
+        }
+
+        log.debug("Language: " + language);
+        return language;
+    }
 }