[Castore-commits] ExportTool.java 1.4 1.5

[Céline BENOIT]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin
In directory adullact1:/tmp/cvs-serv16139/src/java/fr/emn/castor/admin

Modified Files:
	ExportTool.java 
Log Message:
adaptation du code aux médias

Index: ExportTool.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/admin/ExportTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExportTool.java	22 Mar 2006 08:40:22 -0000	1.4
--- ExportTool.java	22 Mar 2006 14:43:47 -0000	1.5
***************
*** 62,69 ****
  import fr.emn.castor.common.tree.TreeRoot;
  import fr.emn.castor.documents.DocumentsConstants;
! import fr.emn.castor.documents.metier.Document;
! import fr.emn.castor.documents.metier.DocumentException;
! import fr.emn.castor.documents.metier.workflow.AState;
! import fr.emn.castor.documents.metier.workflow.Refused;
  import fr.emn.castor.groupes.GroupesConstants;
  import fr.emn.castor.groupes.metier.GroupeNatif;
--- 62,69 ----
  import fr.emn.castor.common.tree.TreeRoot;
  import fr.emn.castor.documents.DocumentsConstants;
! import fr.emn.castor.documents.metier.docGenerique.ADocument;
! import fr.emn.castor.documents.metier.docGenerique.DocumentException;
! import fr.emn.castor.documents.metier.docGenerique.workflow.AState;
! import fr.emn.castor.documents.metier.docGenerique.workflow.Refused;
  import fr.emn.castor.groupes.GroupesConstants;
  import fr.emn.castor.groupes.metier.GroupeNatif;
***************
*** 106,112 ****
      private ArrayList<String> usersList = new ArrayList<String>();
  
!     /**
!      * L'entete XML des fichiers.
!      */
      private String entete = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"yes\" ?>";
  
--- 106,110 ----
      private ArrayList<String> usersList = new ArrayList<String>();
  
!     /** L'entete XML des fichiers. */
      private String entete = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"yes\" ?>";
  
***************
*** 257,265 ****
       */
      private void createDoc(final File[] listFiles) throws IOException {
!         DateFormat df = DateFormat.getDateInstance(DateFormat.FULL);
          PersistenceManager pm = JDOFactory.getPersistenceManager();
          for (int i = 0; i < listFiles.length; i++) {
              // Debut verification des fichiers
!             String docId = listFiles[i].getName();
              File dirFile = listFiles[i].getAbsoluteFile();
              if (log.isDebugEnabled()) {
--- 255,263 ----
       */
      private void createDoc(final File[] listFiles) throws IOException {
!         DateFormat df = DateFormat.getDateInstance(DateFormat.FULL); // date
          PersistenceManager pm = JDOFactory.getPersistenceManager();
          for (int i = 0; i < listFiles.length; i++) {
              // Debut verification des fichiers
!             String docId = listFiles[i].getName(); 
              File dirFile = listFiles[i].getAbsoluteFile();
              if (log.isDebugEnabled()) {
***************
*** 267,271 ****
              }
              // recuperation du document
!             Document doc = null;
              try {
                  doc = rechercheDocument(docId, pm);
--- 265,269 ----
              }
              // recuperation du document
!             ADocument doc = null;
              try {
                  doc = rechercheDocument(docId, pm);
***************
*** 330,335 ****
              }
              system.setValue("stateDate", dateStateString);
!             // ecriture du statut de retroConversion
!             String retroConvStatut = doc.getRetroConvStatut();
              if (log.isDebugEnabled()) {
                  log.debug("  --> Statut de la retroConvertion  : "
--- 328,333 ----
              }
              system.setValue("stateDate", dateStateString);
!             // ecriture du statut de conversion
!             String retroConvStatut = doc.getConversionStatut();
              if (log.isDebugEnabled()) {
                  log.debug("  --> Statut de la retroConvertion  : "
***************
*** 586,595 ****
       * @throws DocumentException
       */
!     private static Document rechercheDocument(
              final String id, final PersistenceManager pm)
              throws DocumentException {
  
          String filtre = "id=='" + DocumentsConstants.PREFIX_ID + id + "'";
!         Query query = pm.newQuery(Document.class, filtre);
          Collection results = (Collection) query.execute();
          if (results.isEmpty()) {
--- 584,593 ----
       * @throws DocumentException
       */
!     private static ADocument rechercheDocument(
              final String id, final PersistenceManager pm)
              throws DocumentException {
  
          String filtre = "id=='" + DocumentsConstants.PREFIX_ID + id + "'";
!         Query query = pm.newQuery(ADocument.class, filtre);
          Collection results = (Collection) query.execute();
          if (results.isEmpty()) {
***************
*** 602,606 ****
                  log.fatal("il existe plusieures instances de ce document !");
                  for (Iterator iter = results.iterator(); iter.hasNext();) {
!                     Document element = (Document) iter.next();
                      log.fatal("--> " + element);
                  }
--- 600,604 ----
                  log.fatal("il existe plusieures instances de ce document !");
                  for (Iterator iter = results.iterator(); iter.hasNext();) {
!                     ADocument element = (ADocument) iter.next();
                      log.fatal("--> " + element);
                  }
***************
*** 608,612 ****
              throw new DocumentException(DocumentException.MULTIPLE_INSTANCES);
          } else {
!             return (Document) results.iterator().next();
          }
      }
--- 606,610 ----
              throw new DocumentException(DocumentException.MULTIPLE_INSTANCES);
          } else {
!             return (ADocument) results.iterator().next();
          }
      }