Index: openacs-4/packages/organizations/organizations.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/organizations.info,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/organizations/organizations.info	26 Feb 2004 15:29:21 -0000	1.4
+++ openacs-4/packages/organizations/organizations.info	27 Sep 2004 23:39:41 -0000	1.4.2.1
@@ -6,32 +6,25 @@
     <pretty-plural>Organizations</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
-
-    <version name="0.2d" url="http://openacs.org/repository/download/apm/organizations-0.2d.apm">
-    <database-support>
-        <database>oracle</database>
-        <database>postgresql</database>
-    </database-support>
+    
+    <version name="0.5d2" url="http://openacs.org/repository/download/apm/organizations-0.5d2.apm">
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
+        <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Implementation of HR-XML organizations datamodel.</summary>
+        <release-date>2004-06-25</release-date>
         <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
-
-        <description format="text/plain">Provides the datamodel for an
-      implementation of the HR-XML organizations spec, but no API for
-      manipulating the data.  Also note that the Oracle code is out of sync
-      with the Postgres code. The source code has comments in it indicating
-      what needs to be updated to make things work correctly [Jade Rubick].
+        <description format="text/plain">Provides the datamodel for an
+      implementation of the HR-XML organizations spec, but no API for
+      manipulating the data.  Also note that the Oracle code is out of sync
+      with the Postgres code. The source code has comments in it indicating
+      what needs to be updated to make things work correctly [Jade Rubick].
         </description>
 
+        <provides url="organizations" version="0.5d2"/>
         <requires url="acs-kernel" version="5.0d13"/>
 
-        <files>
-            <file type="package_spec" path="organizations.info"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/organizations-create.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/organizations-plsql-create.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/organizations-create.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/organizations-plsql-create.sql"/>
-        </files>
+        <callbacks>
+        </callbacks>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/organizations/sql/postgresql/organizations-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/postgresql/organizations-create.sql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/organizations/sql/postgresql/organizations-create.sql	11 Dec 2003 21:40:10 -0000	1.2
+++ openacs-4/packages/organizations/sql/postgresql/organizations-create.sql	27 Sep 2004 23:39:42 -0000	1.2.2.1
@@ -24,10 +24,10 @@
 ';
 
 -- add some data
-insert into organization_types values (acs_object_id_seq.nextval,'Vendor');
-insert into organization_types values (acs_object_id_seq.nextval,'Customer');
-insert into organization_types values (acs_object_id_seq.nextval,'Prospect');
-insert into organization_types values (acs_object_id_seq.nextval,'Other');
+insert into organization_types (type) values ('Vendor');
+insert into organization_types (type) values ('Customer');
+insert into organization_types (type) values ('Prospect');
+insert into organization_types (type) values ('Other');
 
 -- organization
 -- this will be a party
Index: openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql	6 Mar 2004 22:53:24 -0000	1.3
+++ openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql	27 Sep 2004 23:39:42 -0000	1.3.2.1
@@ -167,7 +167,7 @@
     reg_number = p_reg_number
   where organization_id = p_organization_id;
 
-  raise NOTICE ''Updating  - organization - %'',organization_id;
+  raise NOTICE ''Updating  - organization - %'',p_organization_id;
 
 return v_return;
 end;' language 'plpgsql';
@@ -184,7 +184,7 @@
     p_organization_id    alias for $1;
     v_organization_name  organizations.name%TYPE;
 begin
-        select name into v_organization_name
+        select name || ''_'' || organization_id into v_organization_name
                 from organizations
                 where organization_id = p_organization_id;
     return v_organization_name;
Index: openacs-4/packages/organizations/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/index.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/organizations/www/index.tcl	26 Jan 2004 15:39:47 -0000	1.2
+++ openacs-4/packages/organizations/www/index.tcl	27 Sep 2004 23:39:43 -0000	1.2.2.1
@@ -59,11 +59,14 @@
        edit {
             label {}
             display_template {
-               <if @orgs.write_p@ true>
+               <if @orgs.write@>
                 <a href="add-edit" title="Edit this organization">
 		<img src="/shared/images/Edit16.gif" height="16" width="16" 
                 alt="Edit" border="0"></a>
-                </if>        
+                </if>
+                <else>
+                @orgs.write@
+                </else>
             }
         }
         name {
@@ -108,11 +111,12 @@
 	}
     } 
 
-db_multirow -extend { item_url write_p } orgs orgs_query { 
+
+db_multirow -extend { item_url write } orgs orgs_query { 
 } {
     set item_url [export_vars -base "one" {organization_id}]
 
-    set write_p $write_p
+    set write $write_p
 }