From 8f27e65bddd7d4b8515ce620fb485fdd78fcdf89 Mon Sep 17 00:00:00 2001
From: Constantin Jucovschi <cj@ubuntu.localdomain>
Date: Fri, 24 Apr 2009 07:20:22 -0400
Subject: Initial commit

---
 insertutils/Makefile.am                       |  50 ++
 insertutils/insertdemo.sh.in                  | 118 ++++
 insertutils/insertppm.cc                      | 859 ++++++++++++++++++++++++++
 insertutils/test/test_insertppm.log           |  70 +++
 insertutils/test/test_insertppm.log.reference |  69 +++
 insertutils/test/test_insertppm.log.save      |  70 +++
 insertutils/test/test_insertppm.sh            | 152 +++++
 7 files changed, 1388 insertions(+)
 create mode 100644 insertutils/Makefile.am
 create mode 100644 insertutils/insertdemo.sh.in
 create mode 100644 insertutils/insertppm.cc
 create mode 100644 insertutils/test/test_insertppm.log
 create mode 100644 insertutils/test/test_insertppm.log.reference
 create mode 100644 insertutils/test/test_insertppm.log.save
 create mode 100644 insertutils/test/test_insertppm.sh

(limited to 'insertutils')

diff --git a/insertutils/Makefile.am b/insertutils/Makefile.am
new file mode 100644
index 0000000..473f7bf
--- /dev/null
+++ b/insertutils/Makefile.am
@@ -0,0 +1,50 @@
+# -*-Makefile-*-
+#
+# This file is part of rasdaman community.
+#
+# Rasdaman community is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Rasdaman community is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann /
+# rasdaman GmbH.
+#
+# For more information please see <http://www.rasdaman.org>
+# or contact Peter Baumann via <baumann@rasdaman.com>.
+# 
+# MAKEFILE FOR:  
+#   utility programs
+# 
+# COMMENTS: 
+# - Various insertion-tools for special client data
+# 
+##################################################################
+
+AM_CXXFLAGS = $(COMMCXXFLAGS)
+AM_LDFLAGS = $(COMMLDFLAGS)    
+bin_PROGRAMS = insertppm
+bin_SCRIPTS = insertdemo.sh
+insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc
+insertppm_LDADD=../rasodmg/librasodmg.a ../clientcomm/libclientcomm.a \
+                ../compression/libcompression.a ../conversion/libconversion.a \
+                ../raslib/libraslib.a ../rnprotocol/libclientcomm.a \
+                ../network/libnetwork.a
+CLEANFILES = insertdemo.sh
+EXTRA_DIST = insertdemo.sh.in
+
+insertdemo.sh: insertdemo.sh.in Makefile
+	rm -f insertdemo.sh
+	sed -e 's|@bindir[@]|$(bindir)/|g' \
+        -e 's|@pkgdatadir[@]|$(pkgdatadir)/|g'\
+        <insertdemo.sh.in >insertdemo.sh
+	chmod +x insertdemo.sh
+	chmod a-w insertdemo.sh
diff --git a/insertutils/insertdemo.sh.in b/insertutils/insertdemo.sh.in
new file mode 100644
index 0000000..8328b3a
--- /dev/null
+++ b/insertutils/insertdemo.sh.in
@@ -0,0 +1,118 @@
+#!/bin/bash
+#
+# This file is part of rasdaman community.
+#
+# Rasdaman community is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Rasdaman community is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann /
+# rasdaman GmbH.
+#
+# For more information please see <http://www.rasdaman.org>
+# or contact Peter Baumann via <baumann@rasdaman.com>.      
+#
+##########################################################################
+#
+# SOURCE: insertdemo.sh
+#
+# PURPOSE:
+# create the demo collections used in the rasdaman manuals.
+# Currently these are: mr, mr2, rgb.
+# Data are taken from the images directory; they are small enough not to
+# eat away remarkable disk space.
+# The script returns a nonzero exit code upon error.
+#
+# COMMENTS:
+# - insertppm needs the ppm library installed.
+#
+#######################################################################
+
+
+# --- parameter evaluation --------------------------------------------
+
+if [ $# != 5 ]
+then
+	echo "Usage: $0 host port imagedir user passwd"
+	echo "   host        host name of rasdaman server"
+	echo "   port        port where rasdaman server listens (usually: 7001)"
+	echo "   imagedir    source image directory"
+	echo "   user        rasdaman database login name (needs write access)"
+	echo "   passwd      rasdaman password"
+	echo "Example: $0 localhost 7001 @pkgdatadir@examples/images rasadmin rasadmin"
+	exit 0
+fi
+
+    HOST=$1
+    PORT=$2
+IMAGEDIR=$3
+    USER=$4
+  PASSWD=$5
+
+
+# --- global defines --------------------------------------------------
+
+# script name
+PROG=`basename $0`
+
+# database to be used
+DB=RASBASE
+
+# shorthand: insertppm parameters
+INSERTPPM_ARGS="--server $HOST --port $PORT --database $DB --user $USER --passwd $PASSWD"
+
+# --- check prerequisites ---------------------------------------------
+
+echo "$PROG: rasdaman demo data insert script v2.0"
+echo "$PROG: using host $HOST, image directory $IMAGEDIR, and user/passwd $USER/$PASSWD"
+
+# --- evaluate cmd line parameters ------------------------------------
+
+# is insertppm compiled already?
+if [ -f @bindir@insertppm ]
+then
+	INSERTPPM="@bindir@insertppm"
+else
+	echo "$PROG: insertppm not found. Trying to compile it...\c"
+	make --directory=@pkgdatadir@examples/c++ insertppm
+	if [ -f @pkgdatadir@examples/c++/insertppm ]
+	then
+		 echo "ok"
+		 INSERTPPM="@pkgdatadir@examples/c++/insertppm"    
+	else
+		echo "$PROG: Error: Failed to compile insertppm."
+		exit 1
+	fi
+fi
+
+# does $IMAGEDIR point to a good directory?
+if [ ! -d $IMAGEDIR ]
+then
+	echo "$PROG: Illegal package path $IMAGEDIR."
+	exit 1
+fi
+
+# insert packages
+echo -n "mr..."
+for i in $IMAGEDIR/mr_?.pgm;
+do
+	$INSERTPPM $INSERTPPM_ARGS --type grey --collection mr $i || exit 1
+done
+echo -n "mr2..."
+$INSERTPPM $INSERTPPM_ARGS --type grey --collection mr2 $IMAGEDIR/mr_1.pgm || exit 1
+echo -n "rgb..."
+$INSERTPPM $INSERTPPM_ARGS --type color --collection rgb $IMAGEDIR/anthur.ppm || exit 1
+
+echo "$PROG: done."
+
+# end of insertdemo.sh
+
diff --git a/insertutils/insertppm.cc b/insertutils/insertppm.cc
new file mode 100644
index 0000000..37e6e6f
--- /dev/null
+++ b/insertutils/insertppm.cc
@@ -0,0 +1,859 @@
+/*
+* This file is part of rasdaman community.
+*
+* Rasdaman community is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Rasdaman community is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann /
+rasdaman GmbH.
+*
+* For more information please see <http://www.rasdaman.org>
+* or contact Peter Baumann via <baumann@rasdaman.com>.
+/
+/**
+ * SOURCE: insertppm.cc
+ *
+ * MODULE: insertutils
+ *
+ * PURPOSE:
+ *   read one or more ppm image file(s) and create a rasdaman
+ *   object out of its contents.
+ *   If one file is provided, then a 2-D object will be generated.
+ *   If several files are provided then a 3-D object will be
+ *   generated; to this end, all files have to agree on pixel
+ *   type and x/y extent.
+ *   If the collection doesn't exist previously, it is created.
+ *   If it does exist, new objects will be created in it
+ *   (obviously requiring thet the collection type is appropriate).
+ *
+ * COMMENTS:
+ * - Has to be compiled with the following options:
+ *
+ *     -D__STDC__ -DSYSV -I/usr/local/dist/include 
+ *     -L/usr/local/dist/lib -lppm -lpgm -lpbm
+ *
+ *   The defines are necessary so that HP CC can understand the
+ *   ppm.h include correctly. 
+ * - needs PPM package installed.
+ *
+*/
+
+static const char rcsid[] = "@(#)cachetamgr,readppm: $Header: /home/rasdev/CVS-repository/rasdaman/insertutils/insertppm.cc,v 1.67 2006/01/17 07:36:25 rasdev Exp $";
+
+#ifdef EARLY_TEMPLATE
+#define __EXECUTABLE__
+#ifdef __GNUG__
+#include "raslib/template_inst.hh"
+#endif
+#endif
+
+using namespace std;
+
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+#include <sstream>
+#include <stdlib.h>
+#include <getopt.h>
+#include <list>
+
+#include "raslib/rminit.hh"
+#include "rasodmg/marray.hh"
+#include "rasodmg/ref.hh"
+#include "rasodmg/set.hh"
+#include "rasodmg/database.hh"
+#include "rasodmg/partinsert.hh"
+#include "raslib/type.hh"
+#include "raslib/odmgtypes.hh"
+#include "raslib/error.hh"
+
+// this is for inhouse debug macros; not needed for standalone compilation
+#ifdef RMANDEBUG || DEBUG
+	#define DEBUG_MAIN
+	#include "debug.hh"
+#endif
+
+extern "C" {
+	#include <ppm.h>
+}
+
+// program exit codes:
+#define EXIT_OK		0
+#define EXIT_ERROR	-1
+#define EXIT_USAGE	-2
+
+// pixel type names
+#define PIXEL_TYPE_BOOL		"bin"
+#define PIXEL_TYPE_GREY		"grey"
+#define PIXEL_TYPE_COLOR	"color"
+
+// pixel sizes in byte:
+#define PIXSIZE_BW	sizeof(char)
+#define PIXSIZE_GREY	sizeof(char)
+#define PIXSIZE_COL	sizeof(RGBPixel)
+
+// internal pixel type indicator
+typedef enum
+{
+	PIXEL_BOOL,
+	PIXEL_GREY,
+	PIXEL_COLOR
+} PixelType;
+
+// the color image type:
+typedef struct {
+	unsigned char red, green, blue;
+} RGBPixel;
+
+// --- default values --------------------------------------------
+#define DEFAULT_TYPE	"color"
+#define DEFAULT_PORT	"7001"
+#define DEFAULT_HOST	"localhost"
+#define DEFAULT_USER	"rasguest"
+#define DEFAULT_PASSWD	"rasguest"
+#define DEFAULT_VERBOSE	false
+#define DEFAULT_DB	"RASBASE"
+#define DEFAULT_TR_FMT	"Array"
+#define DEFAULT_ST_FMT	"Array"
+#define DEFAULT_TILE_LO	0
+#define DEFAULT_TILE_HI	31
+#define DEFAULT_PIXSIZE	PIXSIZE_COL
+#define DEFAULT_PIXEL_TYPE	PIXEL_COLOR
+
+// --- options --------------------------------------------
+// long option names
+#define OPTION_HELP "help"
+#define OPTION_COLLECTION "collection"
+#define OPTION_TYPE "type"
+#define OPTION_RESCALE "rescale"
+#define OPTION_TILE "tiled"
+#define OPTION_SERVER "server"
+#define OPTION_PORT "port"
+#define OPTION_DATABASE "database"
+#define OPTION_USER "user"
+#define OPTION_PASSWD "passwd"
+#define OPTION_TRANSFERFORMAT "transferformat"
+#define OPTION_TRANSFERFORMATPARAMS "transferformatparams"
+#define OPTION_STORAGEFORMAT "storageformat"
+#define OPTION_STORAGEFORMATPARAMS "storageformatparams"
+#define OPTION_VERBOSE "verbose"
+
+// long option descriptor
+static struct option long_options[] =
+{
+	{ OPTION_HELP,                 0, 0, 0 },
+	{ OPTION_COLLECTION,           1, 0, 0 },
+	{ OPTION_TYPE,                 1, 0, 0 },
+	{ OPTION_RESCALE,              0, 0, 0 },
+	{ OPTION_TILE,                 1, 0, 0 },
+	{ OPTION_SERVER,               1, 0, 0 },
+	{ OPTION_PORT,                 1, 0, 0 },
+	{ OPTION_DATABASE,             1, 0, 0 },
+	{ OPTION_USER,                 1, 0, 0 },
+	{ OPTION_PASSWD,               1, 0, 0 },
+	{ OPTION_TRANSFERFORMAT,       1, 0, 0 },
+	{ OPTION_TRANSFERFORMATPARAMS, 1, 0, 0 },
+	{ OPTION_STORAGEFORMAT,        1, 0, 0 },
+	{ OPTION_STORAGEFORMATPARAMS,  1, 0, 0 },
+	{ OPTION_VERBOSE,              0, 0, 0 },
+	{ 0, 0, 0, 0 }
+};
+
+// short option descriptor
+const char *short_options = "hc:t:rs:d:u:p:v";
+
+// --- verbose output --------------------------------------------
+// verbosity flag
+static bool verbose = DEFAULT_VERBOSE;
+
+// conditional log output
+#define LOG if (verbose) cerr 
+
+// --- globals --------------------------------------------
+// global variables to make readRow work (not nice, I know)
+static FILE* readppm_fp=NULL;
+static int readppm_colsP=0;      // number of columns
+static int readppm_rowsP=0;      // number of rows
+static pixval readppm_maxvalP=0; // maximum pixel value (-> pixel depth)
+static int readppm_formatP=0;
+
+// --- functions --------------------------------------------
+
+/*
+ * calculate size of image
+ * for a 3D image, numSlices is used to determine the z axis extent
+ * preconditions:
+ * - fname!=NULL, \0 terminated
+ * - imgSize contains valid 2D or 3D minterval, depending on mdd3d
+ */
+r_Minterval readHeader( const char *fName, bool mdd3d, unsigned int numSlices )
+{
+	FILE* fp=NULL;
+	int colsP=0;         // number of columns
+	int rowsP=0;         // number of row
+	pixval maxvalP=0;    // maximum pixel value (-> pixel depth)
+	int formatP=0;
+	r_Minterval result;
+
+	// check if the file exists (pm_openr() just dumps on error, leaving db open)
+	std::fstream inFile( fName, std::ios::in );
+	if(!inFile)
+	{
+		cerr << "Error: cannot find input file " << fName << endl;
+		throw r_Error( r_Error::r_Error_General );
+	}
+
+	fp = pm_openr( fName );
+	if(!fp)
+	{
+		cerr << "Error: cannot find input file " << fName << endl;
+		throw r_Error( r_Error::r_Error_General );
+	}
+
+	// initialize colsP and rowsP to create MDD
+	ppm_readppminit( fp, &colsP, &rowsP, &maxvalP, &formatP );
+	pm_close(fp);
+
+	if(mdd3d)
+	{
+		// domain of MDD
+		result = r_Minterval(3)
+		   << r_Sinterval((r_Range)0, (r_Range)(numSlices - 1))
+		   << r_Sinterval((r_Range)0, (r_Range)(colsP - 1))
+		   << r_Sinterval((r_Range)0, (r_Range)(rowsP - 1));
+	}
+	else
+	{
+		// domain of MDD
+		result = r_Minterval(2)
+		   << r_Sinterval((r_Range)0, (r_Range)colsP - 1)
+		   << r_Sinterval((r_Range)0, (r_Range)rowsP - 1);
+	}
+
+	LOG << "header says: " << result << endl;
+	return result;
+}
+
+/*
+ * read one image file
+ * preconditions:
+ * - fname!=NULL, \0 terminated
+ */
+void readImage(char* contents, const char *fName, bool mdd3d, PixelType pixType, bool rescale, r_Range slicenum = 0, r_Range slicepos = 0 ) throw (r_Error)
+{
+	FILE* fp=NULL;		// input image file
+	int colsP=0;		// number of columns
+	int rowsP=0;		// number of rows
+	pixval maxvalP;		// maximum pixel value (-> pixel depth)
+	pixel** pixelsP=NULL;	// all pixels in the image
+	pixel aPixel;		// one pixel
+	pixel scaledPixel;	// pixel scaled to 0 to 255
+
+	// open PPM file
+	fp = pm_openr(fName);
+	if(!fp)
+	{
+		cerr << "iError: cannot find input file " << fName << endl;
+		throw r_Error( r_Error::r_Error_General );
+	}
+
+	// read it (also initializes information about picture)
+	pixelsP = ppm_readppm( fp, &colsP, &rowsP, &maxvalP );
+
+	// iterate through all pixels
+	int i=0, j=0;
+	for(i = 0; i < rowsP; i++)
+	{   
+		for(j = 0; j < colsP; j++)
+		{
+			// read pixel
+			aPixel = pixelsP[i][j];
+	
+			// scale pixel to 0-255
+			if(rescale)
+				PPM_DEPTH( scaledPixel, aPixel, maxvalP, 255 );
+			else
+				scaledPixel = aPixel;
+
+			switch (pixType)
+			{
+				case PIXEL_BOOL:
+					contents[(slicepos*colsP*rowsP + j*rowsP + i)*PIXSIZE_BW] = PPM_GETB( scaledPixel ) == 0 ? 0 : 1; 
+					break;
+				case PIXEL_GREY: // create Char out of pixel (just take blue)
+					contents[(slicepos*colsP*rowsP + j*rowsP + i)*PIXSIZE_GREY] = PPM_GETB( scaledPixel );
+					break;
+				case PIXEL_COLOR: // create ULong out of pixel colors
+					contents[(slicepos*colsP*rowsP + j*rowsP + i)*PIXSIZE_COL + 0] = PPM_GETR( scaledPixel );
+					contents[(slicepos*colsP*rowsP + j*rowsP + i)*PIXSIZE_COL + 1] = PPM_GETG( scaledPixel );
+					contents[(slicepos*colsP*rowsP + j*rowsP + i)*PIXSIZE_COL + 2] = PPM_GETB( scaledPixel );
+					break;
+				default:
+					cerr << "Error: unknown pixel type code: " << pixType << endl;
+					break;
+			}
+		}
+	}
+
+	// close PPM and free memory
+	pm_close(fp);
+	ppm_freearray( pixelsP, rowsP );
+}
+
+/*
+ * open the image file; no reading is done
+ * preconditions:
+ * - fname!=NULL, \0 terminated
+ */
+void openImage( const char *fName, bool mdd3d )
+{
+	// open PPM file
+	readppm_fp = pm_openr( fName );
+	if(!readppm_fp)
+	{
+		cerr << "Error: cannot find input file " << fName  << endl;
+		throw r_Error( r_Error::r_Error_General );
+	}
+
+	ppm_readppminit( readppm_fp, &readppm_colsP, &readppm_rowsP, &readppm_maxvalP, &readppm_formatP );
+}
+
+/*
+ * read numRows rows in an image file
+ */
+void readRows(char* contents, r_Range startRow, r_Range numRows, PixelType pixType, bool rescale)
+{
+	pixel aPixel;     	// one pixel
+	pixel scaledPixel;	// pixel scaled to range 0..255
+	pixel* row=NULL;	// all pixels in one row
+	unsigned int currRow=0;	// current row #
+
+	row = new pixel[readppm_colsP];
+
+	for(currRow = 0; currRow < numRows; currRow++)
+	{
+		// read a row
+		ppm_readppmrow(readppm_fp, row, readppm_colsP, readppm_maxvalP, readppm_formatP);
+
+		// iterate through all pixels in this row
+		for( int i = 0; i < readppm_colsP; i++ )
+		{   
+			// read pixel
+			aPixel = row[i];
+		
+			// scale pixel to 0-255
+			if(rescale)
+				PPM_DEPTH( scaledPixel, aPixel, readppm_maxvalP, 255 );
+			else
+				scaledPixel = aPixel;
+
+			switch (pixType)
+			{
+				case PIXEL_BOOL:
+					contents[(i*numRows + currRow)*PIXSIZE_BW] = (PPM_GETB(scaledPixel)==0) ? 0 : 1; 
+					break;
+				case PIXEL_GREY: // create Bool out of pixel (just take blue)
+					contents[(i*numRows + currRow)*PIXSIZE_GREY] = PPM_GETB( scaledPixel );
+					break;
+				case PIXEL_COLOR: // create ULong out of pixel colors
+					contents[(i*numRows + currRow)*PIXSIZE_COL + 0] = PPM_GETR( scaledPixel );
+					contents[(i*numRows + currRow)*PIXSIZE_COL + 1] = PPM_GETG( scaledPixel );
+					contents[(i*numRows + currRow)*PIXSIZE_COL + 2] = PPM_GETB( scaledPixel );
+					break;
+				default:
+					cerr << "Error: unknown pixel type code: " << pixType << endl;
+					break;
+			}
+		}
+	}
+
+	delete [] row; 
+	row=NULL;
+}
+
+/*
+ * create a transient mdd with domain dom
+ */
+void createMarray(const r_Minterval &dom, r_Ref<r_GMarray> &mddPtr, PixelType pixType)
+{
+	switch (pixType)
+	{
+		case PIXEL_BOOL:
+			LOG << "creating MDD of type bool and extent " << dom << endl;
+			mddPtr = (r_GMarray*)(new r_Marray<r_Boolean>(dom));
+			break;
+		case PIXEL_GREY: // create Bool out of pixel (just take blue)
+			LOG << "creating MDD of type grey and extent " << dom << endl;
+			mddPtr = (r_GMarray*)(new r_Marray<r_Char>(dom));
+			break;
+		case PIXEL_COLOR: // create ULong out of pixel colors
+			LOG << "creating MDD of type color and extent " << dom << endl;
+			mddPtr = (r_GMarray*)(new r_Marray<RGBPixel>(dom));
+			break;
+		default:
+			cerr << "Error: unknown pixel type code: " << pixType << endl;
+			break;
+	}
+}
+
+
+/*
+ * print usage text, using program name 'name'
+ * preconditions:
+ * - name != NULL, name \0 terminated
+ */
+void 
+printUsage(const char* name)
+{
+	cout << "Usage: " << name << " [-h|--help|-c <name>|--collection <name>] [options] files..." << endl;
+	cout << "Options:"<< endl;
+	cout << " -h, --help                      this help" << endl;
+	cout << " -c, --collection <name>         collection to store image; will be created if nonexistent (required)" << endl;
+	cout << " -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: " << DEFAULT_TYPE << ")" << endl;
+	cout << " -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)" << endl;
+	cout << " --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)" << endl;
+	cout << " -s, --server <name>             server host (default: " << DEFAULT_HOST << ")" << endl;
+	cout << " --port <p>                      server port (default: " << DEFAULT_PORT << ")" << endl;    
+	cout << " -d, --database <name>           database name (default: " << DEFAULT_DB << ")" << endl;
+	cout << " -u, --user <name>               user name (default: " << DEFAULT_USER << ")" << endl;
+	cout << " -p, --passwd <passwd>           password (default: " << DEFAULT_PASSWD << ")" << endl << endl;
+	cout << " --transferformat <fmt>          transfer format. default: " << DEFAULT_TR_FMT << ")" << endl;
+	cout << " --transferformatparams <params> transfer format parameters.(default: '')" << endl;    
+	cout << " --storageformat <fmt>           storage format (default: " << DEFAULT_ST_FMT << ")" << endl;
+	cout << " --storageformatparams <params>  storage format parameters.(default: '')" << endl;    
+	cout << " -v, --verbose                   be verbose (default: be brief)" << endl;
+	cout << "Note: If one file is passed, then a 2D object will be generated. " << endl
+	     << "      If several files are passed, then a 3D object will be generated (in the sequence passed)," << endl
+	     << "      In this case all files must have same pixel type and x/y extent." << endl;
+}
+
+int
+main( int argc, char** argv )
+{
+	const char   *prog = argv[0];				// our name
+	int           retval = EXIT_OK;				// program exit code
+
+	PixelType     pixType = DEFAULT_PIXEL_TYPE;		// image pixel type
+	const char   *typeString = DEFAULT_TYPE;		// image pixel type
+	r_Bytes       typeSize=DEFAULT_PIXSIZE;			// pixel size [bytes]
+	const char   *tileString = NULL; 			// transfer format string
+	const char   *transferFormatString = DEFAULT_TR_FMT;	// transfer format string
+	r_Data_Format transferFormat=r_Array;		// transfer format used  
+	const char   *transferFormatParams = "";	   	// transfer format parameters
+	const char   *storageFormatString = DEFAULT_ST_FMT;	// storage format string 
+	r_Data_Format storageFormat=r_Array; 			// storage format used 
+	char         *storageFormatParams = "";			// storage format parameters 
+
+	const char   *collName=NULL;				// name of collection
+
+	r_Minterval   imgSize; 					// size of image
+	r_Minterval   tileSize; 				// size of tiles
+
+	const char   *dbName=DEFAULT_DB;  			// name of database
+	const char   *serverName=DEFAULT_HOST;			// name of RasDaMan server host
+	const char   *serverPortString = DEFAULT_PORT;		// string parameter for port
+	unsigned int serverPort=0;  				// port of RasDaMan server
+	const char   *userName=DEFAULT_USER;  			// name of RasDaMan user
+	const char   *passwd=DEFAULT_PASSWD; 			// password of RasDaMan user
+
+	list<string>  fileNameList;				// input file name list
+
+	bool mdd3d = false;         				// flag for 3D MDD
+	bool tiled = false;         				// flag for tiling
+	bool rescale = false;       				// flag for rescaling pixel values to 0:255
+
+	r_Database database;					// rasdaman database object, for connection
+
+	// --- collect cmd line parameters --------------------------------------------------
+
+	int c;
+	int digit_optind = 0;
+
+	if (argc==1)	// no params at all?
+	{
+		printUsage( prog );
+		return EXIT_USAGE;
+	}
+
+	while (1)
+	{
+		int this_option_optind = optind ? optind : 1;
+		int option_index = 0;
+
+		c = getopt_long (argc, argv, short_options, long_options, &option_index);
+		if (c == -1)
+			break;
+
+		switch (c)
+		{
+			case 0:	// long option
+				if (strcmp(long_options[option_index].name,OPTION_HELP)==0)
+				{
+					printUsage( prog );
+					return EXIT_USAGE;
+				}
+				else if (strcmp(long_options[option_index].name,OPTION_COLLECTION)==0)
+					collName = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_TYPE)==0)
+					typeString = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_RESCALE)==0)
+					rescale = true;
+				else if (strcmp(long_options[option_index].name,OPTION_TILE)==0)
+					tileString = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_SERVER)==0)
+					serverName = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_PORT)==0)
+					serverPortString = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_DATABASE)==0)
+					dbName = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_USER)==0)
+					userName = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_PASSWD)==0)
+					passwd = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_TRANSFERFORMAT)==0)
+					transferFormatString = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_TRANSFERFORMATPARAMS)==0)
+					transferFormatParams = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_STORAGEFORMAT)==0)
+					storageFormatString = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_STORAGEFORMATPARAMS)==0)
+					storageFormatParams = optarg;
+				else if (strcmp(long_options[option_index].name,OPTION_VERBOSE)==0)
+					verbose = true;
+				else
+				{
+					cerr << "Error: invalid option: " << long_options[option_index].name << endl;
+					return EXIT_ERROR;
+				}
+                   		break;
+	
+			case 'h':
+				printUsage( prog );
+				return EXIT_USAGE;
+				break;
+			case 'c':
+				if (!optarg)
+				{
+					cerr << "Error: missing collection name." << endl;
+					return EXIT_ERROR;
+				}
+				collName = optarg;
+				break;
+			case 't':
+				if (!optarg)
+				{
+					cerr << "Error: missing type." << endl;
+					return EXIT_ERROR;
+				}
+				typeString = optarg;
+				break;
+			case 'r':
+				rescale = true;
+				break;
+			case 's':
+				if (!optarg)
+				{
+					cerr << "Error: missing server name." << endl;
+					return EXIT_ERROR;
+				}
+				serverName = optarg;
+				break;
+			case 'd':
+				if (!optarg)
+				{
+					cerr << "Error: missing database name." << endl;
+					return EXIT_ERROR;
+				}
+				dbName = optarg;
+				break;
+			case 'u':
+				if (!optarg)
+				{
+					cerr << "Error: missing user name." << endl;
+					return EXIT_ERROR;
+				}
+				userName = optarg;
+				break;
+			case 'p':
+				if (!optarg)
+				{
+					cerr << "Error: missing password." << endl;
+					return EXIT_ERROR;
+				}
+				passwd = optarg;
+				break;
+			case 'v':
+				verbose = true;
+				break;
+			default:
+				printf ("Error: illegal option letter %c\n", c);
+				break;
+		}
+	} // while
+
+	// get non-option arguments (ie, file names)
+	if (optind < argc)
+	{
+		while (optind < argc)
+			fileNameList.push_back(string(argv[optind++]));
+		mdd3d = (fileNameList.size() > 1);
+	}
+	else
+	{
+		cerr << "Error: no input file name provided." << endl;
+		return EXIT_ERROR;
+	}
+
+	// check mandatory parameters
+	if (collName==NULL)
+	{
+		cerr << "Error: missing collection name; use option '--" << OPTION_COLLECTION << "'." << endl;
+		return EXIT_ERROR;
+	}
+
+	// transform parameters where necessary
+	serverPort = strtol(serverPortString, (char **)NULL, 10);
+	if (errno==ERANGE || errno==EINVAL)
+	{
+		cerr << "Error: port not an integer number: " << serverPortString << endl;
+		return EXIT_ERROR;
+	}
+	if( tileString )
+	{
+		try
+		{
+			tileSize = r_Minterval(tileString);
+			tiled = true;
+		}
+		catch (r_Error e)
+		{
+			cerr << "Error " << e.get_errorno() << ": " << e.what() << endl;
+			return EXIT_ERROR;
+		}
+	}
+	else
+	{
+		// use default tile sizes
+		if(mdd3d)
+			tileSize = r_Minterval(3)
+			  << r_Sinterval((r_Range)DEFAULT_TILE_LO, (r_Range)DEFAULT_TILE_HI)
+			  << r_Sinterval((r_Range)DEFAULT_TILE_LO, (r_Range)DEFAULT_TILE_HI)
+			  << r_Sinterval((r_Range)DEFAULT_TILE_LO, (r_Range)DEFAULT_TILE_HI);
+		else
+			tileSize = r_Minterval(2)
+			  << r_Sinterval((r_Range)DEFAULT_TILE_LO, (r_Range)DEFAULT_TILE_HI)
+			  << r_Sinterval((r_Range)DEFAULT_TILE_LO, (r_Range)DEFAULT_TILE_HI);
+		LOG << "tileSize = " << tileSize << endl;
+	}
+	transferFormat = get_data_format_from_name( transferFormatString );
+	if(transferFormat == r_Data_Format_NUMBER)
+	{
+		cerr << "Error: Invalid transfer format '" << transferFormatString << "'" << endl;
+		return EXIT_ERROR;
+	}
+	storageFormat = get_data_format_from_name( storageFormatString );
+	if(storageFormat == r_Data_Format_NUMBER)
+	{
+		 cerr << "Error: Invalid storage format '" << storageFormatString << "'" << endl;
+		 return EXIT_ERROR;
+	}     
+	if (typeString!=NULL)
+	{
+		if (strcmp(typeString,PIXEL_TYPE_BOOL)==0)
+			pixType = PIXEL_BOOL;
+		else if (strcmp(typeString,PIXEL_TYPE_GREY)==0)
+			pixType = PIXEL_GREY;
+		else if (strcmp(typeString,PIXEL_TYPE_COLOR)==0)
+			pixType = PIXEL_COLOR;
+		else
+		{
+			cerr << "Error: illegal pixel type: " << typeString << endl;
+			return EXIT_ERROR;
+		}
+	}
+
+	LOG << prog << " v2.0 rasdaman PPM image insert utility" << endl;
+
+	LOG << OPTION_COLLECTION << " = " << collName << ", ";
+	LOG << OPTION_TYPE << " = " << typeString << ", ";
+	LOG << "3d = " << mdd3d << ", ";
+	LOG << OPTION_RESCALE << " = " << rescale << ", ";
+	LOG << OPTION_TILE << " = " << tileSize << endl;
+	LOG << OPTION_SERVER << " = " << serverName << ", ";
+	LOG << OPTION_PORT << " = " << serverPort << ", ";
+	LOG << OPTION_DATABASE << " = " << dbName << ", ";
+	LOG << OPTION_USER << " = " << userName << ", ";
+	LOG << OPTION_PASSWD << " = " << passwd << endl;
+	LOG << OPTION_TRANSFERFORMAT << " = " << transferFormatString << ", ";
+	LOG << OPTION_TRANSFERFORMATPARAMS << " = " << transferFormatParams << ", ";
+	LOG << OPTION_STORAGEFORMAT << " = " << storageFormatString << ", ";
+	LOG << OPTION_STORAGEFORMATPARAMS << " = " << storageFormatParams << endl;
+	LOG << OPTION_VERBOSE << " = " << verbose << endl;
+	LOG << "file list = " ;
+	for ( list<string>::iterator from = fileNameList.begin(); from != fileNameList.end(); ++from )
+            LOG << *from << " ";
+        LOG << endl;
+
+	// --- action --------------------------------------------------
+	try
+	{
+		LOG << "connecting to " << serverName << ":" << serverPort << "..." << flush;  
+		database.set_servername(serverName, serverPort);
+		database.set_useridentification(userName, passwd);
+		database.open( dbName );
+		// note: partial insert implicitly opens/closes TA
+
+		// determine MDD object's parameters
+		const char *mddTypeName=NULL;
+		const char *collTypeName=NULL;
+		switch (pixType)
+		{
+			case PIXEL_BOOL:
+				collTypeName = mdd3d ? "BoolSet3" : "BoolSet";
+				mddTypeName  = mdd3d ? "BoolCube" : "BoolImage";
+				typeSize = PIXSIZE_BW;
+				break;
+			case PIXEL_GREY:
+				collTypeName = mdd3d ? "GreySet3" : "GreySet";
+				mddTypeName  = mdd3d ? "GreyCube" : "GreyImage";
+				typeSize = PIXSIZE_GREY;
+				break;
+			case PIXEL_COLOR:
+				collTypeName = mdd3d ? "RGBSet3" : "RGBSet";
+				mddTypeName  = mdd3d ? "RGBCube" : "RGBImage";
+				typeSize = PIXSIZE_COL;
+				break;
+			default:
+				cerr << "Error: unknown pixel type code: " << pixType << endl;
+				throw r_Error( r_Error::r_Error_General );
+		}
+		LOG << "mdd type = " << mddTypeName << ", set type = " << collTypeName << endl;       
+
+		// read header information for imgSize
+		imgSize = readHeader(fileNameList.front().c_str(),mdd3d, fileNameList.size());	// we know we have at least 1 elem in list
+		if(!tiled)
+			tileSize = imgSize;	// if not tiled then tile size = image size
+
+		// Create a partial insert object with regular tiling
+		r_Partial_Insert pins(database, collName, mddTypeName, collTypeName, tileSize, typeSize);
+		
+		r_Ref<r_GMarray> mddPtr;
+		r_Minterval cacheDom;
+
+		// iterate through all the pictures
+		if(mdd3d)
+		{
+			cout << "creating 3D object of extent " << imgSize << " from: " << flush;
+
+			r_Range numImgs = imgSize[0].high()+1; // X
+			r_Range imgRows = imgSize[2].high()+1; // Y
+			r_Range imgCols = imgSize[1].high()+1; // Z
+			r_Range tileX = tileSize[0].high()+1;
+
+			// create domain of first cache
+			cacheDom = r_Minterval(3) << r_Sinterval((r_Range)0, tileX - 1)
+					    << r_Sinterval((r_Range)0, imgCols - 1)
+					    << r_Sinterval((r_Range)0, imgRows - 1);
+
+			createMarray(cacheDom, mddPtr, pixType);
+			char *contents = mddPtr->get_array();
+
+			unsigned int k = 0;
+			list<string>::iterator currentFileName = fileNameList.begin();
+			while ( k < fileNameList.size() )
+			{
+				cout << (*currentFileName).c_str() << "..." << flush;
+				LOG << "#" << k << " " << cacheDom << "..." << flush;
+
+				readImage(contents, (*currentFileName).c_str(), true, pixType, rescale, k, k%tileX);
+
+				if (k % tileX == tileX-1 || k == fileNameList.size()-1)
+				{
+					if (pins.update(mddPtr.ptr(), transferFormat, transferFormatParams, storageFormat, storageFormatParams) != 0)
+						throw r_Error( r_Error::r_Error_General );
+
+					mddPtr.destroy();
+
+					// we are done:
+					if(k == fileNameList.size()-1)
+						break;	
+
+					// create domain of next tile
+					cacheDom = r_Minterval(3)
+						<< r_Sinterval( (r_Range) (k + 1),
+					                        (r_Range) (k+tileX > fileNameList.size()-1 ? fileNameList.size()-1 : k+tileX) )
+						<< r_Sinterval((r_Range)0, imgCols - 1)
+						<< r_Sinterval((r_Range)0, imgRows - 1);
+				 
+					createMarray(cacheDom, mddPtr, pixType);
+					const char *contents = mddPtr->get_array();
+				}
+
+				++currentFileName, ++k;
+			}
+		}
+		else
+		{
+			r_Range imgCols = imgSize[0].high()+1;
+			r_Range imgRows = imgSize[1].high()+1;
+			r_Range tileRows = tileSize[0].high()+1;
+			const char *fName = fileNameList.front().c_str();	// we know we have 1 element in list
+
+			cout << "creating 3D object of extent " << imgSize << " from " << fName << "..." << flush;
+
+			openImage(fName,false);		// open image for reading
+
+			for( int k = 0; k < imgRows; k += tileRows )
+			{
+				// create domain of next tile
+				cacheDom =  r_Minterval(2)
+				  << r_Sinterval((r_Range)0, imgCols - 1)
+				  << r_Sinterval(k, k + min(tileRows-1, imgRows-k-1));
+
+				LOG << "#" << k << " " << cacheDom << "..." << flush;
+
+				createMarray(cacheDom, mddPtr, pixType);
+				char *contents = mddPtr->get_array();
+
+				readRows(contents, k, min(tileRows, imgRows - k), pixType, rescale);
+
+				if (pins.update(mddPtr.ptr(), transferFormat, transferFormatParams, storageFormat, storageFormatParams) != 0)
+					throw r_Error( r_Error::r_Error_General );
+
+				mddPtr.destroy();
+			}
+		}
+		database.close();
+
+		cout << "ok" << endl;
+	}
+	catch(r_Error &err)
+	{
+		cerr << err.what() << endl;
+		// emergency abort/close, ignoring any eventual further exception
+		try
+		{
+			database.close();
+		}
+		catch(...)
+		{ }
+		retval = EXIT_ERROR;
+	}
+        catch (...)
+        {
+                cout << "Panic: unexpected exception." << endl;
+        }
+
+	LOG << argv[0] << " done." << endl;
+	return retval;
+}
diff --git a/insertutils/test/test_insertppm.log b/insertutils/test/test_insertppm.log
new file mode 100644
index 0000000..e9f7c29
--- /dev/null
+++ b/insertutils/test/test_insertppm.log
@@ -0,0 +1,70 @@
+./test_insertppm.sh: testing insertppm start
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+exit code 255
+exit code 255
+./test_insertppm.sh: testing insertppm done
diff --git a/insertutils/test/test_insertppm.log.reference b/insertutils/test/test_insertppm.log.reference
new file mode 100644
index 0000000..31355a5
--- /dev/null
+++ b/insertutils/test/test_insertppm.log.reference
@@ -0,0 +1,69 @@
+./test_insertppm.sh: testing insertppm start
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+exit code 255
+exit code 255
diff --git a/insertutils/test/test_insertppm.log.save b/insertutils/test/test_insertppm.log.save
new file mode 100644
index 0000000..e9f7c29
--- /dev/null
+++ b/insertutils/test/test_insertppm.log.save
@@ -0,0 +1,70 @@
+./test_insertppm.sh: testing insertppm start
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+Usage: ../insertppm [-h|--help|-c <name>|--collection <name>] [options] files...
+Options:
+ -h, --help                      this help
+ -c, --collection <name>         collection to store image; will be created if nonexistent (required)
+ -t, --type <t>                  store as pixel type t where t is one of: bin, grey, color (default: color)
+ -r, --rescale                   rescale pixel values to 8 bit = 0:255 (default: no rescale)
+ --tiled <t>                     store object in tiles of size t where t = [min0:max0,min1:max1,...,minn:maxn] (default: 1 tile)
+ -s, --server <name>             server host (default: localhost)
+ --port <p>                      server port (default: 7001)
+ -d, --database <name>           database name (default: RASBASE)
+ -u, --user <name>               user name (default: rasguest)
+ -p, --passwd <passwd>           password (default: rasguest)
+
+ --transferformat <fmt>          transfer format. default: Array)
+ --transferformatparams <params> transfer format parameters.(default: '')
+ --storageformat <fmt>           storage format (default: Array)
+ --storageformatparams <params>  storage format parameters.(default: '')
+ -v, --verbose                   be verbose (default: be brief)
+Note: If one file is passed, then a 2D object will be generated. 
+      If several files are passed, then a 3D object will be generated (in the sequence passed),
+      In this case all files must have same pixel type and x/y extent.
+exit code 254
+exit code 255
+exit code 255
+./test_insertppm.sh: testing insertppm done
diff --git a/insertutils/test/test_insertppm.sh b/insertutils/test/test_insertppm.sh
new file mode 100644
index 0000000..5250a48
--- /dev/null
+++ b/insertutils/test/test_insertppm.sh
@@ -0,0 +1,152 @@
+#!/bin/bash
+####################### Makefile header ##########################
+#
+# test_insertppm: test insertppm, rasgeo ppm import utility 
+#
+# TEST CANDIDATE:
+# insertppm
+#
+# TEST MODE:
+# automatic
+#
+# PREREQUISITES:
+# - rasdaman server (RNP, RPC) running, any base DBMS
+# - ~rasdaman/images accessible with standard imagery
+#
+# CHANGE HISTORY (append further entries):
+# when:       who:      what:
+# ----------------------------------------------------------------
+# 2005-dec-02 PB        created
+#
+# COMMENTS:
+# - exit -1 if "ERROR" found in log file or in diff to canonical log file
+# - test program must be in cwd
+# - old log is saved to <logfile>.save
+# - todo:
+# 	test storage and transfer parameters
+#
+# Copyright (C) 2005 Dr. Peter Baumann
+#
+##################################################################
+
+# --- declarations -----------------------------------------------
+
+# shorthands and orga stuff
+IPPM=../insertppm
+
+PROG=`basename $0`
+INDENT="+++ "
+
+# ERROR keyword, should be standardised across all rasdaman tests
+ERROR=ERROR
+
+# log file output
+LOG=`basename $0 .sh`.log
+
+# reference log file
+REFLOG=$LOG.reference
+
+# save old log here if it exists
+SAVELOG=$LOG.save
+
+# test defaults:
+COLL_RGB=rgb
+COLL_GREY=mr
+COLL_3D=mr3d
+FILEPATH=~rasdaman/images
+FILE_RGB=$FILEPATH/anthur.ppm
+FILE_GREY=$FILEPATH/mr_1.pgm
+FILE_LIST=$FILEPATH/mr_?.pgm
+TYPE_GREY=grey
+TYPE_RGB=color
+TILED_3D=[1:2,3:4,5:6]
+
+SERVER=`hostname`
+PORT=7001
+DATABASE=RASBASE
+USER=rasadmin
+PASSWD=rasadmin
+
+TRANSFERFORMAT=TIFF
+TRANSFERFORMATPARAMS=TIFF_PARAMS
+STORAGEFORMAT=RLE
+STORAGEFORMATPARAMS=RLE_PARAMS
+
+# --- action -----------------------------------------------
+
+# save old log if present
+if [ -f $LOG ]
+then
+	echo found old log file, shifting it to $SAVELOG
+	mv $LOG $SAVELOG
+fi
+echo "$0: testing insertppm start" | tee $LOG
+
+echo $INDENT $INDENT starting softly
+echo $INDENT no params
+( $IPPM  || (export RC=$?; echo exit code $RC) ) | tee -a $LOG
+
+echo $INDENT call help
+( $IPPM -h  || (export RC=$?; echo exit code $RC) ) | tee -a $LOG
+
+echo $INDENT call help
+( $IPPM --help  || (export RC=$?; echo exit code $RC) ) | tee -a $LOG
+
+echo $INDENT all correct
+echo $INDENT $INDENT all mandatory syntactically correct
+# ( $IPPM -c $COLL_RGB $FILE_RGB || (export RC=$?; echo Fatal $ERROR, exit code $RC) ) | tee -a $LOG
+
+echo $INDENT $INDENT all syntactically correct, long version,
+# ( $IPPM --collection $COLL_3D --type $TYPE_GREY --rescale --tiled $TILED_3D --verbose \
+# 	--server $SERVER --port $PORT --database $DATABASE --user $USER --passwd $PASSWD \
+# 	`ls $FILE_LIST` || (export RC=$?; echo Fatal $ERROR, exit code $RC) ) | tee -a $LOG
+
+echo collection param missing:
+( $IPPM $FILE_RGB \
+	|| (export RC=$?; echo exit code $RC) ) | tee -a $LOG
+echo file param missing:
+( $IPPM --collection $COLL_RGB \
+	|| (export RC=$?; echo exit code $RC) ) | tee -a $LOG
+
+echo $INDENT $INDENT starting softly done
+echo $INDENT $INDENT illegal cmd line options start
+
+echo $INDENT $INDENT mdd domain parameter syntax mismatch
+
+echo tbd.
+
+echo $INDENT $INDENT illegal cmd line options done
+echo
+echo $INDENT $INDENT image type bool
+echo $INDENT $INDENT $INDENT nontiled
+echo tbd.
+echo $INDENT $INDENT $INDENT tiled
+echo tbd.
+echo $INDENT $INDENT image type grey
+echo $INDENT $INDENT $INDENT nontiled
+echo tbd.
+echo $INDENT $INDENT $INDENT tiled
+echo tbd.
+echo $INDENT $INDENT image type rgb
+echo $INDENT $INDENT $INDENT nontiled
+echo tbd.
+echo $INDENT $INDENT $INDENT tiled
+echo tbd.
+
+echo $INDENT $INDENT transfer and storage parameters
+echo tbd.
+
+# --- now compare result with canonical log:
+
+if [ `diff $LOG $REFLOG | wc -l` -ne "0" ]
+then
+	echo $0: $ERROR: log file differes from reference log file, please examine!
+	exit -1
+else
+	echo $0: no difference found between log and reference log
+fi
+
+echo "$0: testing insertppm done" >>$LOG
+echo "$0: done."
+
+
-- 
cgit