v2

src/include/Attachment.hpp

@@ -103,8 +103,8 @@ namespace kaz {
     bool toExtract, toUpdate, toDisclaim;
     /*! id of an image embedded in mbox */
     string cid;
-    /*! url to replace the attachment and its short id */
-    string downloadUrl, downloadId;
+    /*! url to replace the attachment */
+    string downloadUrl;
     /*! properties of embedded image (self encoded with base64)*/
     vector<EmbeddedData> embeddedData;
 

src/include/EmbeddedData.hpp

@@ -50,7 +50,7 @@ namespace kaz {
     int imgIdx;
     /*! extracted in first pass */
     string contentType, name;
-    string downloadUrl, downloadId;
+    string downloadUrl;
     /*! area of base64 relative in the image section */
     string::size_type startData, dataLength;
 

src/include/MainAttachment.hpp

@@ -56,13 +56,14 @@ namespace kaz {
     /*! copy a slice of mbox to stdout */
     static void copy (ifstream &mbox, ofstream &outbox, const streamoff &begin, const streamoff &end);
 
-    /*! get url and id (space separated) from stdin */
-    void fillUrlId (string &url, string &id);
+    /*! get url from stdin */
+    void readDownloadUrl (string &url);
+
+    /*! get archive url from stdin */
+    void readArchiveUrl ();
 
     /*! location of extracted files */
     void setExtractDir (const bfs::path &extractDir);
-    /*! URL base for archive download of all extracted files */
-    void setArchiveDownloadURL (const string &archiveDownloadURL);
     /*! add a single link in disclaim */
     void addLink (string &plain, string &html, const string &url, const string &name) const;
     /*! get disclaim according alls links (retreived or create) */
@@ -80,7 +81,7 @@ namespace kaz {
 
     /*! dir path for extraction */
     bfs::path	extractDir;
-    /*! URL base for download archives */
+    /*! URL for download archives */
     string	archiveDownloadURL;
     
     /*! subset in the tree of all attachments to be consider for extraction or modification */