Index: openacs-4/packages/photo-album/photo-album.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/photo-album.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/photo-album/photo-album.info	18 Jun 2003 12:26:02 -0000	1.5
+++ openacs-4/packages/photo-album/photo-album.info	26 Jun 2003 02:45:08 -0000	1.6
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="4.6.1" url="http://xarg.net/download/photo-album-4.6.1.apm">
+    <version name="4.6.2" url="http://xarg.net/download/photo-album-4.6.2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -17,7 +17,7 @@
         <owner>Tom Baginski</owner>
         <summary>A photo album application that provides photo display
 and grouping functionality using the ACS Content Repository.</summary>
-        <release-date>2003-06-16</release-date>
+        <release-date>2003-06-25</release-date>
         <vendor url="http://xarg.net/">OpenACS</vendor>
         <description format="text/plain">A photo album application that provides photo display and grouping
 functionality using the ACS Content Repository.
Index: openacs-4/packages/photo-album/sql/postgresql/pa-clip-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/pa-clip-drop.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/photo-album/sql/postgresql/pa-clip-drop.sql	12 Jun 2003 06:55:45 -0000	1.1
+++ openacs-4/packages/photo-album/sql/postgresql/pa-clip-drop.sql	26 Jun 2003 02:45:08 -0000	1.2
@@ -27,7 +27,7 @@
 
 select acs_object_type__drop_type('photo_collection', 'f');
 
-drop function pa_collection__new (integer,integer,varchar,timestamp,integer,varchar,integer);
+drop function pa_collection__new (integer,integer,varchar,timestamptz,integer,varchar,integer);
 drop function pa_collection__delete (integer);
 drop function pa_collection__title (integer);
 
Index: openacs-4/packages/photo-album/sql/postgresql/photo-album-clip.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/photo-album-clip.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/photo-album/sql/postgresql/photo-album-clip.sql	12 Jun 2003 06:55:45 -0000	1.2
+++ openacs-4/packages/photo-album/sql/postgresql/photo-album-clip.sql	26 Jun 2003 02:45:08 -0000	1.3
@@ -16,10 +16,10 @@
 
 create table pa_collections ( 
     collection_id     integer 
-		      constraint pa_collection_id_fk
-		      references acs_objects(object_id)
-		      constraint pa_collections_pk
-		      primary key,
+                      constraint pa_collection_id_fk
+                      references acs_objects(object_id)
+                      constraint pa_collections_pk
+                      primary key,
     owner_id          integer
                       constraint pa_collections_owner_id_fk
                       references users(user_id) on delete cascade
@@ -64,7 +64,7 @@
     );
 
 
-create or replace function pa_collection__new (integer,integer,varchar,timestamp,integer,varchar,integer)
+create or replace function pa_collection__new (integer,integer,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   p_collection_id                       alias for $1;       -- default null
Index: openacs-4/packages/photo-album/sql/postgresql/photo-album-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/photo-album-drop.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/photo-album/sql/postgresql/photo-album-drop.sql	12 Jun 2003 06:55:45 -0000	1.3
+++ openacs-4/packages/photo-album/sql/postgresql/photo-album-drop.sql	26 Jun 2003 02:45:08 -0000	1.4
@@ -189,13 +189,13 @@
 -- drop package pa_album;
 drop function pa_album__delete_revision (integer);
 drop function pa_album__delete (integer);
-drop function pa_album__new (varchar, integer, integer, boolean, integer, varchar, varchar, varchar, text, varchar, integer, timestamp, varchar, integer, timestamp, varchar) ;
+drop function pa_album__new (varchar, integer, integer, boolean, integer, varchar, varchar, varchar, text, varchar, integer, timestamptz, varchar, integer, timestamptz, varchar) ;
 
 -- this needs to drop the pa_photo__ functions
 -- drop package pa_photo;  
 drop function pa_photo__delete (integer);
 drop function pa_photo__delete_revision (integer);
-drop function pa_photo__new (varchar,integer,integer,integer,timestamp, integer, varchar, varchar, integer, varchar, varchar, boolean, timestamp, varchar, varchar, text);
+drop function pa_photo__new (varchar,integer,integer,integer,timestamptz, integer, varchar, varchar, integer, varchar, varchar, boolean, timestamptz, varchar, varchar, text);
 
 -- these drop tables as well
 select content_type__drop_type('pa_photo','f','t');
Index: openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql	26 Jun 2003 02:45:08 -0000	1.1
@@ -0,0 +1,45 @@
+-- few more PG 7.3 fixes
+-- @author Vinod Kurup vinod@kurup.com
+-- @cvs-id $Id: upgrade-4.6.1-4.6.2.sql,v 1.1 2003/06/26 02:45:08 vinodk Exp $
+
+-- drop the old function
+-- since the signature is new, 'create or replace' will create, not replace
+
+drop function pa_collection__new (integer,integer,varchar,timestamp,integer,varchar,integer);
+
+create or replace function pa_collection__new (integer,integer,varchar,timestamptz,integer,varchar,integer)
+returns integer as '
+declare
+  p_collection_id                       alias for $1;       -- default null
+  p_owner_id                            alias for $2;       -- default null
+  p_title                               alias for $3;
+  p_creation_date                       alias for $4;       -- default now()
+  p_creation_user                       alias for $5;       -- default null
+  p_creation_ip                         alias for $6;       -- default null
+  p_context_id                          alias for $7;       -- default null
+  v_collection_id                       pa_collections.collection_id%TYPE;
+begin
+        v_collection_id := acs_object__new (
+                p_collection_id,
+                ''photo_collection'',
+                p_creation_date,
+                p_creation_user,
+                p_creation_ip,
+                p_context_id
+        );
+
+        insert into pa_collections
+          (collection_id, owner_id, title)
+        values
+          (v_collection_id, p_owner_id, p_title);
+
+        PERFORM acs_permission__grant_permission(
+          v_collection_id,
+          p_owner_id,
+          ''admin''
+    );
+
+    return v_collection_id;
+
+end;' language 'plpgsql';
+
Index: openacs-4/packages/photo-album/tcl/photo-album-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/photo-album/tcl/photo-album-procs-postgresql.xql	12 Jun 2003 06:55:45 -0000	1.2
+++ openacs-4/packages/photo-album/tcl/photo-album-procs-postgresql.xql	26 Jun 2003 02:45:09 -0000	1.3
@@ -12,7 +12,7 @@
  
 <fullquery name="pa_new_root_folder.make_new_root">      
       <querytext>
-      select photo_album__new_root_folder(:package_id) 	
+      select photo_album__new_root_folder(:package_id)  
       </querytext>
 </fullquery>
 
@@ -55,7 +55,7 @@
 <fullquery name="pa_context_bar_list.context_bar">      
       <querytext>
       select case
-	   when content_item__get_content_type(i.item_id) = 'content_folder'
+           when content_item__get_content_type(i.item_id) = 'content_folder'
            then 'index?folder_id='
            when content_item__get_content_type(i.item_id) = 'pa_album'
            then 'album?album_id='
@@ -75,26 +75,26 @@
 <fullquery name="pa_is_type_in_package.check_is_type_in_package">      
       <querytext>
       select exists (select 1 
-	             from cr_items i, cr_items i2
-	             where i.item_id = :item_id
+                     from cr_items i, cr_items i2
+                     where i.item_id = :item_id
                        and i.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
                        and i2.item_id = :root_folder
                     )
-	     and content_item__get_content_type(:item_id) = :content_type
+             and content_item__get_content_type(:item_id) = :content_type
 
       </querytext>
 </fullquery>
 
  
 <fullquery name="pa_grant_privilege_to_creator.grant_privilege">      
       <querytext>
-	
-	select acs_permission__grant_permission (
-	:object_id, -- object_id 
-	:user_id, -- grantee_id
-	:privilege -- privilege  
-	)
-	
+        
+        select acs_permission__grant_permission (
+        :object_id, -- object_id 
+        :user_id, -- grantee_id
+        :privilege -- privilege  
+        )
+        
       </querytext>
 </fullquery>
 
@@ -151,7 +151,7 @@
         UPDATE pa_photos 
         SET camera_model = :tmp_exif_Cameramodel,
             user_filename = :upload_name,
-            date_taken = datetime(:tmp_exif_DateTime),
+            date_taken = to_timestamp(:tmp_exif_DateTime,'YYYY-MM-DD HH24:MI:SS'),
             flash = :tmp_exif_Flashused,
             aperture = :tmp_exif_Aperture,
             metering = :tmp_exif_MeteringMode,
@@ -173,7 +173,7 @@
               and crr.revision_id = cri.latest_revision
               and i.image_id = cri.latest_revision
             order by crr.content_length desc
-	
+        
       </querytext>
 </fullquery>