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

[Thomas Draier]

tdraier     2005/11/14 14:04:33 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  import page template changes
  
  Revision  Changes    Path
  1.42      +7 -2      
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.41&r2=1.42&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ImportHandler.java        10 Nov 2005 10:31:36 -0000      1.41
  +++ ImportHandler.java        14 Nov 2005 13:04:32 -0000      1.42
  @@ -288,7 +288,7 @@
                                       
currentObject.markLanguageForDeletion(jParams.getUser(), language, 
stateModifContext);
                                   }
                               } else if (op == 
VersioningDifferenceStatus.TO_BE_UPDATED) {
  -                                update(currentObject, atts, 
jParams.getUser());
  +                                update(currentObject, localName, atts, 
jParams.getUser());
                               }
                           }
   
  @@ -687,7 +687,7 @@
           return object;
       }
   
  -    protected void update(ContentObject object, Attributes atts, JahiaUser 
user) throws JahiaException {
  +    protected void update(ContentObject object, String localName, Attributes 
atts, JahiaUser user) throws JahiaException {
           int pageID = 0;
           if (object instanceof ContentField) {
               ContentField cf = (ContentField) object;
  @@ -713,6 +713,11 @@
               ContentPage cp = (ContentPage) object;
               String title = atts.getValue(ImportExportBaseService.JAHIA_URI, 
"title");
               cp.setTitle(language, title, elr);
  +            if ("page".equals(localName)) {
  +                String template = 
atts.getValue(ImportExportBaseService.JAHIA_URI, "template");
  +                JahiaPageDefinition jpd = 
ServicesRegistry.getInstance().getJahiaPageTemplateService().lookupPageTemplateByName(template,
 site.getID());
  +                cp.setPageTemplateID(jpd.getID(), elr);
  +            }
               cp.commitChanges(true,true,user);
               pageID = cp.getID();
           }