Knora integration

.gitignore

@@ -42,3 +42,5 @@ icc.zip
 
 # ignore test results
 /Testing
+/test/nginx/logs/error.log
+_lena512.jp2

config/sipi.config.lua

@@ -180,7 +180,7 @@ sipi = {
     -- The secret for generating JWT's (JSON Web Tokens) (exactly 42 characters)
     --
     jwt_secret = 'UP 4888, nice 4-8-4 steam engine',
-    --            12345678901234567890123456789012
+    --            123456789012345678901234567890123456789012
 
     --
     -- Name of the logfile (a ".txt" is added...) !!! Currently not used, since logging
@@ -192,6 +192,11 @@ sipi = {
     -- loglevel, one of "EMERGENCY", "ALERT", "CRITICAL", "ERROR", "WARNING", "NOTICE", "INFORMATIONAL", "DEBUG"
     --
     loglevel = "DEBUG",
+
+    --
+    -- The maximum allowed age of temporary files (in seconds) before they are deleted. Defaults to one day.
+    --
+    max_temp_file_age = 86400
 }
 
 admin = {
@@ -253,6 +258,10 @@ routes = {
         method = 'GET',
         route = '/luaexe/test2',
         script = 'test2.lua'
+    },
+    {
+        method = 'POST',
+        route = '/api/upload',
+        script = 'upload.lua'
     }
-
 }

config/sipi.debug-config.lua

@@ -131,10 +131,10 @@ sipi = {
     logfile = "sipi.log",
 
     --
-    -- loglevel, one of "TRACE", "DEBUG", "INFO", "NOTICE", "WARN", "ERROR",
-    --    "CRITICAL", "ALERT", "EMER", "OFF"
+    -- loglevel, one of "DEBUG", "INFO", "NOTICE", "WARNING", "ERR",
+    -- "CRIT", "ALERT", "EMERG"
     --
-    loglevel = "TRACE",
+    loglevel = "DEBUG",
 }
 
 --

include/SipiConf.h

@@ -47,6 +47,7 @@ namespace Sipi {
         std::string ssl_key;
 #endif
         std::string img_root; //<! path to root of image repository
+        int max_temp_file_age;
         int subdir_levels = -1;
         std::vector<std::string> subdir_excludes;
         bool prefix_as_path; //<! Use IIIF-prefix as part of path or ignore it...
@@ -97,6 +98,8 @@ namespace Sipi {
 
         inline std::string getImgRoot(void) { return img_root; }
 
+        inline int getMaxTempFileAge(void) { return max_temp_file_age; }
+
         inline bool getPrefixAsPath(void) { return prefix_as_path; }
 
         inline int getJpegQuality(void) { return jpeg_quality; }

include/SipiIO.h

@@ -46,6 +46,20 @@ namespace Sipi {
         ScalingMethod png;
     } ScalingQuality;
 
+    class SipiImgInfo {
+    public:
+        enum { FAILURE = 0, DIMS = 1, ALL = 2 } success;
+        int width;
+        int height;
+        std::string origname;
+        std::string mimetype;
+
+        SipiImgInfo(void) {
+            success = FAILURE;
+            width = 0;
+            height = 0;
+        };
+    };
 
     class SipiImage; //!< forward declaration of class SipiImage
 
@@ -54,6 +68,9 @@ namespace Sipi {
      */
     class SipiIO {
     public:
+        virtual ~SipiIO() {};
+
+
         /*!
          * Method used to read an image file
          *
@@ -75,7 +92,7 @@ namespace Sipi {
          * \param[out] width Width of the image in pixels
          * \param[out] height Height of the image in pixels
          */
-        virtual bool getDim(std::string filepath, size_t &width, size_t &height) = 0;
+        virtual SipiImgInfo getDim(std::string filepath) = 0;
 
         /*!
          * Write an image for a file using the given file format implemented by the subclass

include/SipiImage.h

@@ -87,6 +87,7 @@ namespace Sipi {
         SKIP_NONE = 0x00, SKIP_ICC = 0x01, SKIP_XMP = 0x02, SKIP_IPTC = 0x04, SKIP_EXIF = 0x08, SKIP_ALL = 0xFF
     } SkipMetadata;
 
+    enum InfoError { INFO_ERROR };
 
     /*!
     * This class implements the error handling for the different image formats.
@@ -388,7 +389,7 @@ namespace Sipi {
          * \param[out] width Width of the image in pixels
          * \param[out] height Height of the image in pixels
          */
-        static void getDim(std::string filepath, size_t &width, size_t &height);
+        SipiImgInfo getDim(std::string filepath);
 
         /*!
          * Get the dimension of the image object

include/formats/SipiIOJ2k.h

@@ -40,6 +40,7 @@ namespace Sipi {
     class SipiIOJ2k : public SipiIO {
     private:
     public:
+        virtual ~SipiIOJ2k() {};
         /*!
          * Method used to read an image file
          *
@@ -60,7 +61,7 @@ namespace Sipi {
          * \param[out] width Width of the image in pixels
          * \param[out] height Height of the image in pixels
          */
-        bool getDim(std::string filepath, size_t &width, size_t &height);
+        Sipi::SipiImgInfo getDim(std::string filepath);
 
         /*!
          * Write a TIFF image to a file, stdout or to a memory buffer

include/formats/SipiIOJpeg.h

@@ -39,6 +39,8 @@ namespace Sipi {
         void parse_photoshop(SipiImage *img, char *data, int length);
 
     public:
+        virtual ~SipiIOJpeg() {};
+
         /*!
          * Method used to read an image file
          *
@@ -59,7 +61,7 @@ namespace Sipi {
          * \param[out] width Width of the image in pixels
          * \param[out] height Height of the image in pixels
          */
-        bool getDim(std::string filepath, size_t &width, size_t &height);
+        Sipi::SipiImgInfo getDim(std::string filepath);
 
 
         /*!

include/formats/SipiIOPng.h

@@ -34,6 +34,8 @@ namespace Sipi {
 
     class SipiIOPng : public SipiIO {
     public:
+        virtual ~SipiIOPng() {};
+
         /*!
          * Method used to read an image file
          *
@@ -52,7 +54,7 @@ namespace Sipi {
          * \param[out] width Width of the image in pixels
          * \param[out] height Height of the image in pixels
          */
-        bool getDim(std::string filepath, size_t &width, size_t &height);
+        Sipi::SipiImgInfo getDim(std::string filepath);
 
 
         /*!

include/formats/SipiIOTiff.h

@@ -83,6 +83,8 @@ namespace Sipi {
         unsigned char *cvrt8BitTo1bit(const SipiImage &img, unsigned int &sll);
 
     public:
+        virtual ~SipiIOTiff() {};
+
         static void initLibrary(void);
 
         /*!
@@ -100,10 +102,9 @@ namespace Sipi {
         * Get the dimension of the image
         *
         * \param[in] filepath Pathname of the image file
-        * \param[out] width Width of the image in pixels
-        * \param[out] height Height of the image in pixels
+        * \return Image information
         */
-        bool getDim(std::string filepath, size_t &width, size_t &height);
+        SipiImgInfo getDim(std::string filepath);
 
 
         /*!