Changeset 14552

Timestamp:

2007-09-20T16:20:43+12:00 (17 years ago)

Author:

qq6

Message:

fixed a bug of checking external link

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

@@ -393 +393 @@
         boolean is_external_link = false;
         if (is_external.equals("0")) {is_external_link = true;}
-        if (!doc_id.startsWith("HASH") && !is_external_link){
+        if (is_external.equals("1") && !doc_id.startsWith("HASH") && !is_external_link){
         if (doc_id.endsWith(".rt")){
             doc_id = getHrefOID(doc_id.substring(0,doc_id.length()-3));
             if (doc_id!=null){
             doc_id += ".rt";
-            // }else{
-            //  is_external_link = true;
-            // }
             }else{
-            doc_id = getHrefOID(doc_id);
-            //   if (doc_id==null){
-            //  is_external_link = true;
-            }
-        }
-        } 
-        
+            is_external_link = true;
+            }
+        }else{
+            doc_id = getHrefOID(doc_id);
+            if (doc_id==null){ is_external_link = true;}
+        }
+        }
         if (!is_external_link){
         if (external_id) {
@@ -557 +554 @@
         String doc_id = doc_ids[i];
         String is_external=is_externals[i];
+
         boolean is_external_link=false;
         if (is_external.equals("0")){is_external_link = true;}
-        if (!doc_id.startsWith("HASH") && !is_external_link){
+        if (is_external.equals("1") && !doc_id.startsWith("HASH") && !is_external_link){
+        //if (!doc_id.startsWith("HASH")){
         if (doc_id.endsWith(".rt")){
             String find_doc_id = getHrefOID(doc_id.substring(0,doc_id.length()-3));
             if (find_doc_id!=null){
             doc_id = doc_id + ".rt";
-            //}else{
-            //is_external_link=true;    
-            }
+            }else{
+            is_external_link=true;  
+            }
+            
         }else {
             String find_doc_id = getHrefOID(doc_id);
-            if (find_doc_id!=null){
-                doc_id = find_doc_id;
-            //}else{
-            //is_external_link=true;
+            if (find_doc_id==null){
+            is_external_link=true;
+            }else{
+            doc_id = find_doc_id;
             }
         }