gphoto4ruby 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,5 +1,15 @@
 == master
 
+* Added "delete file from camera" function
+
+== 0.1.2
+
+* Had to change version number to make gem build
+* 'Save' function can accept options. See rdoc
+* Gemspec made safer
+
+== 0.1.1
+
 * Added rdoc comments
 * Added saving captured image to specified folder
 * Added folders browsing

data/README.rdoc

@@ -17,19 +17,92 @@ calling object methods.
 * First of all you'll need the original gphoto2 C library installed. For
   installation instructions goto http://gphoto.org.
 
-* Apparently this GitHub will not build this Gem due to "$SAFE problem".
-  So you can download it from http://rubyforge.org/projects/gphoto4ruby/
-  and install it with:
+* On Ubuntu 8.04 it is:
 
-    sudo gem install gphoto4ruby-version.gem
+    sudo apt-get install gphoto2
+    
+* On Mac OS X gphoto2 is installed through DarwinPorts
+    
+* You can install GPhoto4Ruby gem from GitHub or from RubyForge. Use one of
+  the following lines depending on your preferences:
+
+    sudo gem install lonelyelk-gphoto4ruby --source http://gems.github.com
+    
+  <b>or</b>
+
+    sudo gem install gphoto4ruby
   
-* Plug your digital camera through usb and run:
+* Connect your digital camera through usb, locate example.rb file and run:
 
     ruby example.rb
+    
+* <b>NOTE!<b> On Mac OS X there is a process you need to kill before using
+  gphoto2. You can find more information on this at http://gphoto.org
 
 == Usage
 
-See example.rb
+After installation of this gem rdocs are generated for you. Ruby file
+<b>example.rb</b> is installed along with this gem. All examples are tested
+on Kubuntu 8.04 and Mac OS X 10.4.11 with digital camera Nikon DSC D80
+connected through usb in PTP mode.
+
+<b>example.rb:</b>
+
+  require "rubygems"
+  require "gphoto4ruby"
+
+  ports = GPhoto2::Camera.ports
+  if ports.empty?
+
+      # ports array can be empty if there is only one camera plugged in
+      # or there are no cameras connected to the computer
+      # assuming there is one
+      c = GPhoto2::Camera.new()
+
+      # list available configuration items with current values and lists
+      # of allowed values
+      c.configs.each do |cfg|
+          puts cfg + " value is: " + c[cfg].to_s
+          puts "values available are: " + c[cfg, :all].inspect
+      end
+
+      # capture image
+      c.capture
+        
+      # now camera virtual path is in the folder with images
+      # list image file names
+      puts "files on camera: " + c.files.inspect
+        
+      # just an example of camera browsing
+      puts "some folder stuff: " + c.folder_up.subfolders.inspect
+        
+      # save preview of captured image in the current directory on hard drive
+      c.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
+        
+      # save captured file in the current directory on hard drive and delete
+      # it from camera
+      c.capture.save.delete
+  else
+      puts ports.length.to_s + "cameras connected"
+      cams = []
+      ports.each do |port|
+          c = GPhoto2::Camera.new(port)
+          puts "camera in port: " + port
+          c.configs.each do |cfg|
+              puts cfg + " value is: " + c[cfg].to_s
+              puts "values available are: " + c[cfg, :all].inspect
+          end
+          cams.push c
+      end
+      # to capture image with all attached cameras simultaneously use:
+      cams.each_index do |index|
+          if index < cams.length - 1
+              fork {cams[index].capture; exit!}
+          else
+              cams[index].capture
+          end
+      end
+  end
 
 == Contact
 

data/Rakefile

@@ -10,7 +10,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
             include("ext/gphoto4ruby.c")
     rdoc.main = "README.rdoc"
     rdoc.title = "GPhoto4Ruby documentation"
-    rdoc.rdoc_dir = "docs"
+    rdoc.rdoc_dir = "rdoc"
     rdoc.options << "--charset=UTF-8"
     rdoc.options << "--webcvs=http://github.com/lonelyelk/gphoto4ruby/tree/master"
 end

data/example.rb

@@ -3,17 +3,35 @@ require "gphoto4ruby"
 
 ports = GPhoto2::Camera.ports
 if ports.empty?
+
     # ports array can be empty if there is only one camera plugged in
     # or there are no cameras connected to the computer
     # assuming there is one
     c = GPhoto2::Camera.new()
+
+    # list available configuration items with current values and lists
+    # of allowed values
     c.configs.each do |cfg|
         puts cfg + " value is: " + c[cfg].to_s
         puts "values available are: " + c[cfg, :all].inspect
     end
+
+    # capture image
     c.capture
+    
+    # now camera virtual path is in the folder with images
+    # list image file names
     puts "files on camera: " + c.files.inspect
+    
+    # just an example of camera browsing
     puts "some folder stuff: " + c.folder_up.subfolders.inspect
+    
+    # save preview of captured image in the current directory on hard drive
+    c.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
+    
+    # save captured file in the current directory on hard drive and delete
+    # it from camera
+    c.capture.save.delete
 else
     puts ports.length.to_s + "cameras connected"
     cams = []
@@ -24,12 +42,9 @@ else
             puts cfg + " value is: " + c[cfg].to_s
             puts "values available are: " + c[cfg, :all].inspect
         end
-        c.capture
-        puts "files on camera: " + c.files.inspect
-        puts "some folder stuff: " + c.folder_up.subfolders.inspect
         cams.push c
     end
-    # to capture image with all attached cameras at a time use:
+    # to capture image with all attached cameras simultaneously use:
     cams.each_index do |index|
         if index < cams.length - 1
             fork {cams[index].capture; exit!}

data/ext/gphoto4ruby.c

@@ -215,8 +215,7 @@ static VALUE camera_allocate(VALUE klass) {
     GPhoto2Camera *c;
     c = (GPhoto2Camera*) malloc(sizeof(GPhoto2Camera));
     c->virtFolder = (char*) malloc(sizeof(char)*100);
-    strcpy(c->virtFolder, "/");//store_00010001/DCIM/100NCD80/");
-//    c->path = "/store_00010001";
+    strcpy(c->virtFolder, "/");
     c->context = gp_context_new();
     retval = gp_camera_new(&(c->camera));
     if (retval == GP_OK) {
@@ -244,6 +243,8 @@ static VALUE camera_allocate(VALUE klass) {
  * port parameter can be passed to specify which camera is addressed with
  * object.
  *
+ * Examples:
+ *
  *   GPhoto2::Camera.new
  *   GPhoto2::Capera.new(GPhoto2::Camera.ports[0])
  *
@@ -296,6 +297,8 @@ static VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
  * Returns an array of usb port paths with cameras. If only one camera
  * is connected, returned array is empty.
  *
+ * Examples:
+ *
  *   # with one camera connected
  *   GPhoto2::Camera.ports          #=>     []
  *   # with two cameras connected
@@ -336,6 +339,8 @@ static VALUE camera_class_ports(VALUE klass) {
  *
  * Sends command to camera to capture image with current configuration
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   c.capture
  *
@@ -359,61 +364,201 @@ static VALUE camera_capture(VALUE self) {
 
 /*
  * call-seq:
- *   capture_save(folder="")        =>      camera
+ *   save(options={})               =>      camera
  *
- * Sends command to camera to capture image with current configuration
- * and saves file into specified folder with the same filename as on
- * camera file system.
+ * Downloads file from camera to hard drive.
+ * Available options are:
+ * * :file - Name of the file to download from camera. File is expected
+ *   to be found in current path. If this option is not specified, last
+ *   captured image is downloaded.
+ * * :new_name - New file name to be used when saving file on hard drive.
+ *   If this option is not specified, camera file system filename is used.
+ * * :to_folder - Folder path on hard drive to save downloaded image to.
+ * * :type - Type of file to download from camera. Available types are 
+ *   <b>:normal</b> (default) and <b>:preview</b>
+ *
+ * Examples:
  *
  *   c = GPhoto2::Camera.new
- *   c.capture_save "/home"
+ *   c.capture.save :type => :preview,              => Downloads preview of
+ *               :new_name => "PREVIEW.JPG"            captured image
+ *   c.save :file => "DSC_0144.JPG",                => Downloads specified file
+ *               :to_folder => "/home/user",           to /home/user/xyz.gf.JPG
+ *               :new_name => "xyz.gf",
  *
  */
-static VALUE camera_capture_save(int argc, VALUE *argv, VALUE self) {
-    int retval;
+static VALUE camera_save(int argc, VALUE *argv, VALUE self) {
+    int retval, i;
+    int newName = -1;
+    CameraFileType fileType = GP_FILE_TYPE_NORMAL;
     GPhoto2Camera *c;
-    const char *fData;
-    char *fPath;
-    char fName[100];
+    const char *fData, *key, *val;
+    char *fPath, *newNameStr, *pchNew, *pchSrc;
+    char fName[100], cFileName[100], cFolderName[100];
     unsigned long int fSize;
     int fd;
-    
-    if (argc > 1) {
-        rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
-        return Qnil;
-    }
+    VALUE arr, hVal;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    
+    strcpy(fName, "");
+    strcpy(cFileName, c->path.name);
+    strcpy(cFolderName, c->path.folder);
 
-    retval = gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, &(c->path), c->context);
-    if (retval == GP_OK) {
-        strcpy(c->virtFolder, c->path.folder);
-        if (retval == GP_OK) {
-            retval = gp_camera_file_get(c->camera, c->path.folder, c->path.name, GP_FILE_TYPE_NORMAL, c->file, c->context);
-            if (retval == GP_OK) {
-                retval = gp_file_get_data_and_size(c->file, &fData, &fSize);
-                if (retval == GP_OK) {
-                    if (argc == 1)  {
-                        fPath = RSTRING(argv[0])->ptr;
-                        if (strlen(fPath) == 0) {
-                            strcpy(fName, c->path.name);
-                        } else if (fPath[strlen(fPath)] == '/') {
+    switch(argc) {
+        case 0:
+            break;
+        case 1:
+            Check_Type(argv[0], T_HASH);
+            arr = rb_funcall(argv[0], rb_intern("keys"), 0);
+            for (i = 0; i < RARRAY(arr)->len; i++) {
+                switch(TYPE(RARRAY(arr)->ptr[i])) {
+                    case T_STRING:
+                        key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                        break;
+                    case T_SYMBOL:
+                        key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                        break;
+                    default:
+                        rb_raise(rb_eTypeError, "Not valid key type");
+                        return Qnil;
+                }
+                if (strcmp(key, "to_folder") == 0) {
+                    fPath = RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr;
+                    if (strlen(fPath) > 0) {
+                        if (fPath[strlen(fPath)] == '/') {
                             strcpy(fName, fPath);
-                            strcat(fName, c->path.name);
                         } else {
                             strcpy(fName, fPath);
                             strcat(fName, "/");
-                            strcat(fName, c->path.name);
                         }
-                    } else {
-                        strcpy(fName, c->path.name);
+                    } 
+                } else if (strcmp(key, "new_name") == 0) {
+                    newNameStr = RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr;
+                    if (strlen(newNameStr) > 0) {
+                        newName = 0;
+                    }
+                } else if (strcmp(key, "type") == 0) {
+                    hVal = rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]);
+                    switch(TYPE(hVal)) {
+                        case T_STRING:
+                            val = RSTRING(hVal)->ptr;
+                            break;
+                        case T_SYMBOL:
+                            val = rb_id2name(rb_to_id(hVal));
+                            break;
+                        default:
+                            rb_raise(rb_eTypeError, "Not valid value type");
+                            return Qnil;
+                    }
+                    if (strcmp(val, "normal") == 0) {
+                        fileType = GP_FILE_TYPE_NORMAL;
+                    } else if (strcmp(val, "preview") == 0) {
+                        fileType = GP_FILE_TYPE_PREVIEW;
                     }
-                    fd = open(fName, O_CREAT | O_WRONLY, 0644);
-                    write(fd, fData, fSize);
-                    close(fd);
-                    return self;
+                } else if (strcmp(key, "file") == 0) {
+                    strcpy(cFolderName, c->virtFolder);
+                    strcpy(cFileName, RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr);
                 }
             }
+            break;
+        default:
+            rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
+            return Qnil;
+    }
+    
+    retval = gp_filesystem_reset(c->camera->fs);
+    if (retval == GP_OK) {
+        retval = gp_camera_file_get(c->camera, cFolderName, cFileName, fileType, c->file, c->context);
+        if (retval == GP_OK) {
+            retval = gp_file_get_data_and_size(c->file, &fData, &fSize);
+            if (retval == GP_OK) {
+                if (newName == 0)  {
+                    strcat(fName, newNameStr);
+                    pchNew = strrchr(newNameStr, '.');
+                    pchSrc = strrchr(cFileName, '.');
+                    if (pchNew == NULL) {
+                        strcat(fName, pchSrc);
+                    } else if (strcmp(pchNew, pchSrc) != 0) {
+                        strcat(fName, pchSrc);
+                    }
+                } else {
+                    strcat(fName, cFileName);
+                }
+                fd = open(fName, O_CREAT | O_WRONLY, 0644);
+                write(fd, fData, fSize);
+                close(fd);
+                return self;
+            }
+        }
+    }
+    rb_raise_gp_result(retval);
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   delete(options={})             =>      camera
+ *
+ * Deletes file from camera.
+ * Available options are:
+ * * :file - Name of the file to delete from camera. File is expected
+ *   to be found in current path. If this option is not specified, last
+ *   captured image is deleted.
+ *
+ * Examples:
+ *
+ *   c = GPhoto2::Camera.new
+ *   c.capture.save.delete
+ *   c.delete :file => "DSC_0144.JPG"
+ *
+ */
+static VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
+    int retval, i;
+    GPhoto2Camera *c;
+    const char *key;
+    char cFileName[100], cFolderName[100];
+    VALUE arr;
+    
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    
+    strcpy(cFileName, c->path.name);
+    strcpy(cFolderName, c->path.folder);
+
+    switch(argc) {
+        case 0:
+            break;
+        case 1:
+            Check_Type(argv[0], T_HASH);
+            arr = rb_funcall(argv[0], rb_intern("keys"), 0);
+            for (i = 0; i < RARRAY(arr)->len; i++) {
+                switch(TYPE(RARRAY(arr)->ptr[i])) {
+                    case T_STRING:
+                        key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                        break;
+                    case T_SYMBOL:
+                        key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                        break;
+                    default:
+                        rb_raise(rb_eTypeError, "Not valid key type");
+                        return Qnil;
+                }
+                if (strcmp(key, "file") == 0) {
+                    strcpy(cFolderName, c->virtFolder);
+                    strcpy(cFileName, RSTRING(rb_hash_aref(argv[0], RARRAY(arr)->ptr[i]))->ptr);
+                }
+            }
+            break;
+        default:
+            rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
+            return Qnil;
+    }
+    
+    retval = gp_filesystem_reset(c->camera->fs);
+    if (retval == GP_OK) {
+        retval = gp_camera_file_delete(c->camera, cFolderName, cFileName, c->context);
+        if (retval == GP_OK) {
+            return self;
         }
     }
     rb_raise_gp_result(retval);
@@ -426,6 +571,8 @@ static VALUE camera_capture_save(int argc, VALUE *argv, VALUE self) {
  *
  * Returns an array of adjustable camera configurations.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.configs                      #=>     ["capturetarget", "imgquality",
@@ -460,6 +607,8 @@ static VALUE camera_get_configs(VALUE self) {
  * (cfg) can be string or symbol and must be in configs method returned array.
  * When called with directive <b>:all</b> returns an array of allowed values
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c["f-number"]                  #=>     "f/4.5"
@@ -546,6 +695,8 @@ static VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
  *
  * Sets specified camera configuration to specified value if value is allowed.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c["f-number"] = "f/4.5"        #=>     "f/4.5"
@@ -604,6 +755,8 @@ static VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
  * Returns current camera path. When image is captured, folder changes to
  * path where files are saved on camera.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.folder                       #=>     "/"
@@ -625,6 +778,8 @@ static VALUE camera_folder(VALUE self) {
  *
  * Returns an array of subfolder names in current camera path.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.folder                       #=>     "/"
@@ -665,6 +820,8 @@ static VALUE camera_subfolders(VALUE self) {
  *
  * Returns an array of file names in current camera path.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.folder                       #=>     "/"
@@ -711,6 +868,8 @@ static VALUE camera_files(VALUE self) {
  *
  * Changes current camera path one level up.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.folder                       #=>     "/"
@@ -744,6 +903,8 @@ static VALUE camera_folder_up(VALUE self) {
  * Changes current camera path one level down into subfolder with
  * specified name.
  *
+ * Examples:
+ *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
  *   c.folder                       #=>     "/"
@@ -808,7 +969,8 @@ void Init_gphoto4ruby() {
     rb_define_method(rb_cGPhoto2Camera, "[]", camera_get_value, -1);
     rb_define_method(rb_cGPhoto2Camera, "[]=", camera_set_value, 2);
     rb_define_method(rb_cGPhoto2Camera, "capture", camera_capture, 0);
-    rb_define_method(rb_cGPhoto2Camera, "capture_save", camera_capture_save, -1);
+    rb_define_method(rb_cGPhoto2Camera, "save", camera_save, -1);
+    rb_define_method(rb_cGPhoto2Camera, "delete", camera_delete, -1);
     rb_define_method(rb_cGPhoto2Camera, "folder", camera_folder, 0);
     rb_define_method(rb_cGPhoto2Camera, "subfolders", camera_subfolders, 0);
     rb_define_method(rb_cGPhoto2Camera, "files", camera_files, 0);

data/ext/gphoto4ruby.h

@@ -56,7 +56,11 @@ static VALUE camera_allocate(VALUE klass);
 
 static VALUE camera_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE camera_class_ports(VALUE klass);
+
 static VALUE camera_capture(VALUE self);
+
+static VALUE camera_save(int argc, VALUE *argv, VALUE self);
+
 static VALUE camera_get_configs(VALUE self);
 static VALUE camera_get_value(int argc, VALUE *argv, VALUE self);
 static VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - heq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-15 00:00:00 +04:00
+date: 2008-08-19 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -21,21 +21,25 @@ executables: []
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
+- ext/gphoto4ruby.c
 - README.rdoc
 - LICENSE
 - CHANGELOG.rdoc
-- ext/gphoto4ruby.c
-files: 
-- ext/gphoto4ruby.c
-- ext/gphoto4ruby.h
 - docs/COPYING
-- docs/COPIYNG.LESSER
-- docs/gphoto4ruby_api_ru.txt
-- LICENSE
+- docs/COPYING.LESSER
+files: 
 - CHANGELOG.rdoc
+- LICENSE
 - README.rdoc
 - Rakefile
+- docs
+- docs/COPYING
+- docs/COPYING.LESSER
 - example.rb
+- ext
+- ext/extconf.rb
+- ext/gphoto4ruby.c
+- ext/gphoto4ruby.h
 has_rdoc: true
 homepage: http://github.com/lonelyelk/gphoto4ruby
 post_install_message: 

data/docs/gphoto4ruby_api_ru.txt

@@ -1,49 +0,0 @@
-GPhoto2::Camera
-Класс для управления камерами, подключенными через usb-порты к компьютеру.
-Следует написать require "gphoto4ruby"
-
-GPhoto2::Camera.ports() -> Array
-Метод класса. Возвращает массив, содержащий пути (path) usb-портов, к которым подключены камеры, если камер более одной.
-
-GPhoto2::Camera.new() -> GPhoto2::Camera
-Конструктор класса. Создает объект для управления первой авто-определенной камерой (обычно это камера, которая была подключена последней).
-
-GPhoto2::Camera.new(port) -> GPhoto2::Camera
-Конструктор класса. Создает объект для управления камерой, подключенной к заданному порту. Актуально при подключении более одной камеры.
-port (String) -- путь (path) порта с камерой. Следует использовать элементы массива, возвращаемого методом класса GPhoto2::Camera.ports
-Пример:
-cams = Array.new
-GPhoto2::Camera.ports.each do |port|
-    cams.push(GPhoto2::Camera.new(port))
-end
-
-configs() -> Array
-Метод объекта. Возвращает массив с именами (name) доступных для изменения настроек камеры.
-
-[config_name] -> String или Float
-Метод объекта. Возвращает значение настройки с именем config_name.
-config_name (String или Symbol) -- имя (name) настройки камеры. Следует использовать элементы массива, возвращаемые методом configs().
-Пример:
-cam[:focallength]       -> 10.5
-cam["f-number"]         -> "f/4"
-cam[cam.configs[0]]
-
-[config_name, directive] -> Array
-Метод объекта. Возвращает информацию о настройке в зависимости от директивы directive.
-config_name (String или Symbol) -- имя (name) настройки камеры. Следует использовать элементы массива, возвращаемые методом configs().
-directive (Symbol) -- указывает на информацию, которую следует выдать
-    :all -- возвращается массив с допустимыми значениями настройки.
-Пример:
-cam["exptime", :all]    -> ["0.002", "0.003", ...]
-
-[config_name] = value -> String или Float
-Метод объекта. Изменяет значение указанной настройки на новое.
-config_name (String или Symbol) -- имя (name) настройки камеры. Следует использовать элементы массива, возвращаемые методом configs().
-value (String или Float) -- новое значение настройки. Следует использовать элементы массива, возвращаемые методом [] с директивой :all.
-Пример:
-cam[:exptime] = "0.010" -> "0.010"
-cam["f-number"] = cam["f-number", :all][3]
-
-capture() -> GPhoto2::Camera
-Метод объекта. Посылает сигнал на камеру для съемки изображения.
-