Changeset 18368 for gli/branches/rtl-gli/src/org/greenstone/gatherer/cdm/Format4gs3.java

Timestamp:

2009-01-12T12:20:53+13:00 (15 years ago)

Author:

kjdon

Message:

copied a couple of files directly over from gli trunk. They should have been identical after merge as I had made no changes to them, but they weren't

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/cdm/Format4gs3.java (modified) (1 diff)

gli/branches/rtl-gli/src/org/greenstone/gatherer/cdm/Format4gs3.java

@@ -67 +67 @@
         
         is_classifier = element.getParentNode().getNodeName().equals(StaticStrings.CLASSIFY_ELEMENT);
-        
-        if(is_classifier) {
+
+    if(is_classifier && CollectionDesignManager.classifier_manager!=null) {
             //The getClassifierPosition() method also sets the classifier_options variable.
             feature_name = Classifier.CLASSIFIER_PREFIX + getClassifierPosition(element);   
             Classifier classifier = getClassifier(feature_name);
             //set the classifier_options string
-            classifier_options = classifier.toString();
-
+        if (classifier != null){
+        classifier_options = classifier.toString();
+        }
                     
             pure_format = toOneLineFormat(XMLTools.getNodeText(element));