From 2cc1c02050ca6e1156959bcf43de65523a874e42 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Mon, 18 Feb 2013 17:53:59 +0000
Subject: [PATCH] evo: business coll and new category declaration
---
core/trunk/core/class/LinkController.php | 2 +-
core/trunk/structure.sql | 127 +++++++++++++++++++++++
2 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/core/trunk/core/class/LinkController.php b/core/trunk/core/class/LinkController.php
index f5920a04671..cdac00a1482 100755
--- a/core/trunk/core/class/LinkController.php
+++ b/core/trunk/core/class/LinkController.php
@@ -67,7 +67,7 @@ class LinkController
$return .= '<td class="barreLinks" width="2">';
$return .= '</td>';
$return .= '<td align="center">';
- $return .= $_SESSION['mail_categories'][$infos['category_id']];
+ $return .= $_SESSION['coll_categories']['letterbox_coll'][$infos['category_id']];
$return .= '</td>';
$return .= '<td class="barreLinks" width="2">';
$return .= '</td>';
diff --git a/core/trunk/structure.sql b/core/trunk/structure.sql
index 58fc475b8f7..2d6483d2449 100644
--- a/core/trunk/structure.sql
+++ b/core/trunk/structure.sql
@@ -2968,3 +2968,130 @@ FROM rm_documents
LEFT JOIN folders file_plan_position ON rm_content_descriptions.file_plan_position = file_plan_position.folder_id AND foldertype_id = '101'
LEFT JOIN folders schedule ON rm_items.schedule_id = schedule.folders_system_id
WHERE item_type = 'ArchiveObject';
+
+-- log collection
+-- res_log
+DROP TABLE IF EXISTS res_log CASCADE;
+CREATE TABLE res_log
+(
+ res_id SERIAL,
+ title character varying(255) DEFAULT NULL::character varying,
+ subject text,
+ description text,
+ publisher character varying(255) DEFAULT NULL::character varying,
+ contributor character varying(255) DEFAULT NULL::character varying,
+ type_id bigint NOT NULL,
+ format character varying(50) NOT NULL,
+ typist character varying(128) NOT NULL,
+ creation_date timestamp without time zone NOT NULL,
+ fulltext_result character varying(10) DEFAULT NULL,
+ ocr_result character varying(10) DEFAULT NULL,
+ converter_result character varying(10) DEFAULT NULL,
+ author character varying(255) DEFAULT NULL::character varying,
+ author_name text,
+ identifier character varying(255) DEFAULT NULL::character varying,
+ source character varying(255) DEFAULT NULL::character varying,
+ doc_language character varying(50) DEFAULT NULL::character varying,
+ relation bigint,
+ coverage character varying(255) DEFAULT NULL::character varying,
+ doc_date timestamp without time zone,
+ docserver_id character varying(32) NOT NULL,
+ folders_system_id bigint,
+ arbox_id character varying(32) DEFAULT NULL::character varying,
+ path character varying(255) DEFAULT NULL::character varying,
+ filename character varying(255) DEFAULT NULL::character varying,
+ offset_doc character varying(255) DEFAULT NULL::character varying,
+ logical_adr character varying(255) DEFAULT NULL::character varying,
+ fingerprint character varying(255) DEFAULT NULL::character varying,
+ filesize bigint,
+ is_paper character(1) DEFAULT NULL::bpchar,
+ page_count integer,
+ scan_date timestamp without time zone,
+ scan_user character varying(50) DEFAULT NULL::character varying,
+ scan_location character varying(255) DEFAULT NULL::character varying,
+ scan_wkstation character varying(255) DEFAULT NULL::character varying,
+ scan_batch character varying(50) DEFAULT NULL::character varying,
+ burn_batch character varying(50) DEFAULT NULL::character varying,
+ scan_postmark character varying(50) DEFAULT NULL::character varying,
+ envelop_id bigint,
+ status character varying(10) NOT NULL,
+ destination character varying(50) DEFAULT NULL::character varying,
+ approver character varying(50) DEFAULT NULL::character varying,
+ validation_date timestamp without time zone,
+ work_batch bigint,
+ origin character varying(50) DEFAULT NULL::character varying,
+ is_ingoing character(1) DEFAULT NULL::bpchar,
+ priority smallint,
+ arbatch_id bigint DEFAULT NULL,
+ policy_id character varying(32) DEFAULT NULL::character varying,
+ cycle_id character varying(32) DEFAULT NULL::character varying,
+ cycle_date timestamp without time zone,
+ is_multi_docservers character(1) NOT NULL DEFAULT 'N'::bpchar,
+ is_frozen character(1) NOT NULL DEFAULT 'N'::bpchar,
+ custom_t1 text,
+ custom_n1 bigint,
+ custom_f1 numeric,
+ custom_d1 timestamp without time zone,
+ custom_t2 character varying(255) DEFAULT NULL::character varying,
+ custom_n2 bigint,
+ custom_f2 numeric,
+ custom_d2 timestamp without time zone,
+ custom_t3 character varying(255) DEFAULT NULL::character varying,
+ custom_n3 bigint,
+ custom_f3 numeric,
+ custom_d3 timestamp without time zone,
+ custom_t4 character varying(255) DEFAULT NULL::character varying,
+ custom_n4 bigint,
+ custom_f4 numeric,
+ custom_d4 timestamp without time zone,
+ custom_t5 character varying(255) DEFAULT NULL::character varying,
+ custom_n5 bigint,
+ custom_f5 numeric,
+ custom_d5 timestamp without time zone,
+ custom_t6 character varying(255) DEFAULT NULL::character varying,
+ custom_d6 timestamp without time zone,
+ custom_t7 character varying(255) DEFAULT NULL::character varying,
+ custom_d7 timestamp without time zone,
+ custom_t8 character varying(255) DEFAULT NULL::character varying,
+ custom_d8 timestamp without time zone,
+ custom_t9 character varying(255) DEFAULT NULL::character varying,
+ custom_d9 timestamp without time zone,
+ custom_t10 character varying(255) DEFAULT NULL::character varying,
+ custom_d10 timestamp without time zone,
+ custom_t11 character varying(255) DEFAULT NULL::character varying,
+ custom_t12 character varying(255) DEFAULT NULL::character varying,
+ custom_t13 character varying(255) DEFAULT NULL::character varying,
+ custom_t14 character varying(255) DEFAULT NULL::character varying,
+ custom_t15 character varying(255) DEFAULT NULL::character varying,
+ tablename character varying(32) DEFAULT 'res_log'::character varying,
+ initiator character varying(50) DEFAULT NULL::character varying,
+ dest_user character varying(128) DEFAULT NULL::character varying,
+ video_batch integer DEFAULT NULL,
+ video_time integer DEFAULT NULL,
+ video_user character varying(128) DEFAULT NULL,
+ video_date timestamp without time zone,
+ esign_proof_id character varying(255),
+ esign_proof_content text,
+ esign_content text,
+ esign_date timestamp without time zone,
+ CONSTRAINT res_log_pkey PRIMARY KEY (res_id)
+)
+WITH (OIDS=FALSE);
+
+DROP TABLE IF EXISTS adr_log;
+CREATE TABLE adr_log
+(
+ res_id bigint NOT NULL,
+ docserver_id character varying(32) NOT NULL,
+ path character varying(255) DEFAULT NULL::character varying,
+ filename character varying(255) DEFAULT NULL::character varying,
+ offset_doc character varying(255) DEFAULT NULL::character varying,
+ fingerprint character varying(255) DEFAULT NULL::character varying,
+ adr_priority integer NOT NULL,
+ CONSTRAINT adr_log_pkey PRIMARY KEY (res_id, docserver_id)
+)
+WITH (OIDS=FALSE);
+
+DROP VIEW IF EXISTS res_view_log;
+CREATE OR REPLACE VIEW res_view_log AS
+ select * from res_log;
--
GitLab