cvs commit: jahia/core/src/java/org/jahia/services/importexport ImportHandler.java

[Thomas Draier]

tdraier     2005/10/20 16:54:33 CEST

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  import date fields
  
  Revision  Changes    Path
  1.30      +12 -4     
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.29&r2=1.30&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ImportHandler.java        19 Oct 2005 16:13:52 -0000      1.29
  +++ ImportHandler.java        20 Oct 2005 14:54:33 -0000      1.30
  @@ -591,6 +591,7 @@
                   if (fieldType == FieldTypes.PAGE) {
                       value = "";
                   }
  +                value = parseValue(fieldType, value);
   
                   JahiaField field = 
ServicesRegistry.getInstance().getJahiaFieldService().createJahiaField(0,site.getID(),pageID,containerID,jfd.getID(),fieldType,
 0, value, 0, 0, 0, EntryLoadRequest.STAGING_WORKFLOW_STATE, language);
                   if (field.isShared()) {
  @@ -602,7 +603,10 @@
                       DAVFileAccess objectDav = 
JahiaWebdavBaseService.getInstance().getDAVFileAccess(jParams, site, 
jParams.getUser(), value);
                       JahiaFileField fField = objectDav.getJahiaFileField();
                       field.setObject(fField);
  +                } else if(fieldType == FieldTypes.DATE) {
  +                    field.setObject(value);
                   }
  +
                   ServicesRegistry.getInstance ().getJahiaFieldService 
().saveField (field, parent.getAclID (), jParams);
   
                   cf = field.getContentField();
  @@ -628,7 +632,7 @@
                   // ?
               } else {
                   String value = 
atts.getValue(ImportExportBaseService.JAHIA_URI, "value");
  -                jahiaField.setValue(parseValue(cf,value));
  +                jahiaField.setValue(parseValue(cf.getType(),value));
                   if (fieldType == FieldTypes.FILE) {
                       DAVFileAccess objectDav = 
JahiaWebdavBaseService.getInstance().getDAVFileAccess(jParams, site, 
jParams.getUser(), value);
                       JahiaFileField fField = objectDav.getJahiaFileField();
  @@ -753,7 +757,11 @@
                   }
                   if (value != null) {
                       JahiaField jf = metadataContentField.getJahiaField(elr);
  -                    jf.setValue(parseValue(metadataContentField,value));
  +                    String fieldValue = 
parseValue(metadataContentField.getType(), value);
  +                    jf.setValue(fieldValue);
  +                    if (jf.getType() == ContentFieldTypes.DATE) {
  +                        jf.setObject(fieldValue);
  +                    }
                       jf.save(jParams);
                   }
               }
  @@ -764,8 +772,8 @@
           }
       }
   
  -    public String parseValue(ContentField contentField, String value) {
  -        switch (contentField.getType()) {
  +    public String parseValue(int type, String value) {
  +        switch (type) {
               case ContentFieldTypes.DATE:
                   DateFormat df = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
                   try {