phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: infolog/setup phpgw_en.lang,1.19,1.20 setup.inc.


From: Ralf Becker <address@hidden>
Subject: [Phpgroupware-cvs] CVS: infolog/setup phpgw_en.lang,1.19,1.20 setup.inc.php,1.16,1.17 tables_current.inc.php,1.10,1.11 tables_update.inc.php,1.4,1.5
Date: Thu, 17 Oct 2002 18:01:11 -0400

Update of /cvsroot/phpgroupware/infolog/setup
In directory subversions:/tmp/cvs-serv26249

Modified Files:
        phpgw_en.lang setup.inc.php tables_current.inc.php 
        tables_update.inc.php 
Log Message:
update with new table-structure for infolog


Index: phpgw_en.lang
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/setup/phpgw_en.lang,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** phpgw_en.lang       14 Oct 2002 00:40:20 -0000      1.19
--- phpgw_en.lang       17 Oct 2002 22:00:43 -0000      1.20
***************
*** 1,4 ****
--- 1,17 ----
  %1 records imported   infolog en      %1 records imported
  %1 records read (not yet imported, you may go back and uncheck test import)   
infolog en      %1 records read (not yet imported, you may go %2back%3 and 
uncheck Test Import)
+ %s $row_cont[info_addr]       infolog en      %s $row_cont[info_addr]
+ %s today      infolog en      %s Today
+ - subprojects from    infolog en      - Subprojects from
+ 0%    infolog en      0%
+ 10%   infolog en      10%
+ 20%   infolog en      20%
+ 30%   infolog en      30%
+ 40%   infolog en      40%
+ 50%   infolog en      50%
+ 60%   infolog en      60%
+ 70%   infolog en      70%
+ 80%   infolog en      80%
+ 90%   infolog en      90%
  <b>file-attachments via symlinks</b> instead of uploads and retrieval via 
file:/path for direct lan-clients   infolog en      en      
  a short subject for the entry infolog en      a short subject for the entry
***************
*** 29,32 ****
--- 42,46 ----
  categories    infolog en      Categories
  category      infolog en      Category
+ check to set startday infolog en      check to set startday
  click here to create the link infolog en      click here to create the Link
  click here to start the search        infolog en      click here to start the 
search
***************
*** 73,76 ****
--- 87,91 ----
  finish        infolog en      finish
  from  infolog en      From
+ high  infolog en      high
  id    infolog en      Id
  import        infolog en      Import
***************
*** 94,97 ****
--- 109,113 ----
  list no subs/childs   infolog en      List no Subs/Childs
  longer textual description    infolog en      longer textual description
+ low   infolog en      low
  new search    infolog en      New search
  no - cancel   infolog en      No - Cancel
***************
*** 99,102 ****
--- 115,119 ----
  no filter     infolog en      no Filter
  none  infolog en      None
+ normal        infolog en      normal
  not   infolog en      not
  not assigned  infolog en      not assigned
***************
*** 171,174 ****
--- 188,192 ----
  view subs     infolog en      view Subs
  view the parent of this entry and all his subs        infolog en      View 
the parent of this entry and all his subs
+ view this linked entry in its application     infolog en      view this 
linked entry in its application
  when should the todo or phonecall be started, it shows up from that date in 
the filter open or own open (startpage)   infolog en      when should the ToDo 
or Phonecall be started, it shows up from that date in the filter open or own 
open (startpage)
  will-call     infolog en      will call

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/setup/setup.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** setup.inc.php       9 Oct 2002 00:43:17 -0000       1.16
--- setup.inc.php       17 Oct 2002 22:00:43 -0000      1.17
***************
*** 14,18 ****
        $setup_info['infolog']['name']      = 'infolog';
        $setup_info['infolog']['title']     = 'Info Log';
!       $setup_info['infolog']['version']   = '0.9.15.003';
        $setup_info['infolog']['app_order'] = 20;
        $setup_info['infolog']['tables']    = 
array('phpgw_infolog','phpgw_links');
--- 14,18 ----
        $setup_info['infolog']['name']      = 'infolog';
        $setup_info['infolog']['title']     = 'Info Log';
!       $setup_info['infolog']['version']   = '0.9.15.004';
        $setup_info['infolog']['app_order'] = 20;
        $setup_info['infolog']['tables']    = 
array('phpgw_infolog','phpgw_links');

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/setup/tables_current.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** tables_current.inc.php      1 Sep 2002 20:41:36 -0000       1.10
--- tables_current.inc.php      17 Oct 2002 22:00:43 -0000      1.11
***************
*** 16,20 ****
                        'fd' => array(
                                'info_id' => array('type' => 'auto','nullable' 
=> False),
!                               'info_type' => array('type' => 
'varchar','precision' => '255','default' => 'task','nullable' => False),
                                'info_from' => array('type' => 
'varchar','precision' => '64','nullable' => True),
                                'info_addr' => array('type' => 
'varchar','precision' => '64','nullable' => True),
--- 16,20 ----
                        'fd' => array(
                                'info_id' => array('type' => 'auto','nullable' 
=> False),
!                               'info_type' => array('type' => 
'varchar','precision' => '10','nullable' => False,'default' => 'task'),
                                'info_from' => array('type' => 
'varchar','precision' => '64','nullable' => True),
                                'info_addr' => array('type' => 
'varchar','precision' => '64','nullable' => True),
***************
*** 22,37 ****
                                'info_des' => array('type' => 'text','nullable' 
=> True),
                                'info_owner' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'info_responsible' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
                                'info_access' => array('type' => 
'varchar','precision' => '10','nullable' => True,'default' => 'public'),
!                               'info_cat' => array('type' => 'int','precision' 
=> '4','default' => '0','nullable' => False),
                                'info_datemodified' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'info_startdate' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
!                               'info_enddate' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
!                               'info_id_parent' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
!                               'info_pri' => array('type' => 
'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
!                               'info_time' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
!                               'info_bill_cat' => array('type' => 
'int','precision' => '4','default' => '0','nullable' => False),
!                               'info_status' => array('type' => 
'varchar','precision' => '255','nullable' => True,'default' => 'done'),
!                               'info_confirm' => array('type' => 
'varchar','precision' => '255','nullable' => True,'default' => 'not')
                        ),
                        'pk' => array('info_id'),
--- 22,39 ----
                                'info_des' => array('type' => 'text','nullable' 
=> True),
                                'info_owner' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'info_responsible' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
                                'info_access' => array('type' => 
'varchar','precision' => '10','nullable' => True,'default' => 'public'),
!                               'info_cat' => array('type' => 'int','precision' 
=> '4','nullable' => False,'default' => '0'),
                                'info_datemodified' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'info_startdate' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_enddate' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_id_parent' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_pri' => array('type' => 
'varchar','precision' => '10','nullable' => True,'default' => 'normal'),
!                               'info_time' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_bill_cat' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_status' => array('type' => 
'varchar','precision' => '10','nullable' => True,'default' => 'done'),
!                               'info_confirm' => array('type' => 
'varchar','precision' => '10','nullable' => True,'default' => 'not'),
!                               'info_modifier' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0'),
!                               'info_link_id' => array('type' => 
'int','precision' => '4','nullable' => False,'default' => '0')
                        ),
                        'pk' => array('info_id'),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/setup/tables_update.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tables_update.inc.php       1 Sep 2002 21:13:20 -0000       1.4
--- tables_update.inc.php       17 Oct 2002 22:00:43 -0000      1.5
***************
*** 159,161 ****
--- 159,219 ----
                return $GLOBALS['setup_info']['infolog']['currentver'];
        }
+ 
+ 
+       $test[] = '0.9.15.003';
+       function infolog_upgrade0_9_15_003()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array(
+                       'type' => 'varchar',
+                       'precision' => '10',
+                       'nullable' => False,
+                       'default' => 'task'
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_pri',array(
+                       'type' => 'varchar',
+                       'precision' => '10',
+                       'nullable' => True,
+                       'default' => 'normal'
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array(
+                       'type' => 'varchar',
+                       'precision' => '10',
+                       'nullable' => True,
+                       'default' => 'done'
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_confirm',array(
+                       'type' => 'varchar',
+                       'precision' => '10',
+                       'nullable' => True,
+                       'default' => 'not'
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_infolog','info_modifier',array(
+                       'type' => 'int',
+                       'precision' => '4',
+                       'nullable' => False,
+                       'default' => '0'
+               ));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_infolog','info_link_id',array(
+                       'type' => 'int',
+                       'precision' => '4',
+                       'nullable' => False,
+                       'default' => '0'
+               ));
+ 
+               // ORDER BY link_app2 DESC gives addressbook the highes 
precedens, use ASC for projects
+               $GLOBALS['phpgw_setup']->oProc->query("SELECT link_id,link_id1 
FROM phpgw_links WHERE link_app1='infolog' ORDER BY link_app2 DESC");
+               $links = array();
+               while ($GLOBALS['phpgw_setup']->oProc->next_record())
+               {
+                       $links[$GLOBALS['phpgw_setup']->oProc->f(1)] = 
$GLOBALS['phpgw_setup']->oProc->f(0);
+               }
+               reset($links);
+               while (list($info_id,$link_id) = each($links))
+               {
+                       $GLOBALS['phpgw_setup']->oProc->query("UPDATE 
phpgw_infolog SET info_link_id=$link_id WHERE info_id=$info_id");
+               }
+ 
+               $GLOBALS['setup_info']['infolog']['currentver'] = '0.9.15.004';
+               return $GLOBALS['setup_info']['infolog']['currentver'];
+       }
  ?>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]