gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 17:05:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2015-07-30 21:08:36 +02:00
commit 9f01b99511
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/xmldump.php
View File

@ -13,6 +13,7 @@ function usage() { /* {{{ */
echo " -v, --version: print version and exit.\n";
echo " --config: set alternative config file.\n";
echo " --folder: set start folder.\n";
echo " --skip-root: do not export the root folder itself.\n";
echo " --maxsize: maximum size of files to be included in output\n";
echo " (defaults to 100000)\n";
echo " --contentdir: directory where all document versions are stored\n";
@ -283,6 +284,8 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
echo " fileref=\"".$document->getID()."-".$version->getVersion().$version->getFileType()."\" />\n";
if($contentdir) {
copy($dms->contentDir . $version->getPath(), $contentdir.$document->getID()."-".$version->getVersion().$version->getFileType());
} else {
echo "Warning: version content (size=".filesize($dms->contentDir . $version->getPath()).") will be missing from output\n";
}
}
} else {
@ -316,6 +319,8 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
echo " fileref=\"".$document->getID()."-A-".$file->getID().$file->getFileType()."\" />\n";
if($contentdir) {
copy($dms->contentDir . $version->getPath(), $contentdir.$document->getID()."-A-".$file->getID().$file->getFileType());
} else {
echo "Warning: file content (size=".filesize($dms->contentDir . $file->getPath()).") will be missing from output\n";
}
}
} else {

55
utils/xmlimport.php
View File

@ -268,6 +268,16 @@ function insert_document($document) { /* {{{ */
}
}
}
$version_attributes = array();
if(isset($initversion['user_attributes'])) {
foreach($initversion['user_attributes'] as $orgid=>$value) {
if(array_key_exists((int) $orgid, $objmap['attributedefs'])) {
$version_attributes[$objmap['attributedefs'][$orgid]] = $value;
} else {
echo "Warning: User attribute ".$orgid." cannot be mapped\n";
}
}
}
if(!$result = $folder->addDocument(
$document['attributes']['name'],
$document['attributes']['comment'],
@ -285,7 +295,7 @@ function insert_document($document) { /* {{{ */
$initversion['version'],
isset($initversion['attributes']['comment']) ? $initversion['attributes']['comment'] : '',
$attributes,
array(), //version_attributes
$version_attributes,
null //workflow
)
) {
@ -327,7 +337,16 @@ function insert_document($document) { /* {{{ */
}
}
}
$version_attributes = array();
if(isset($version['user_attributes'])) {
foreach($version['user_attributes'] as $orgid=>$value) {
if(array_key_exists((int) $orgid, $objmap['attributedefs'])) {
$version_attributes[$objmap['attributedefs'][$orgid]] = $value;
} else {
echo "Warning: User attribute ".$orgid." cannot be mapped\n";
}
}
}
if(!empty($version['fileref'])) {
$filename = tempnam('/tmp', 'FOO');
copy($version['fileref'], $filename);
@ -349,7 +368,7 @@ function insert_document($document) { /* {{{ */
$reviews, //reviewers
$approvals, //approvers
$version['version'],
array(), //attributes
$version_attributes,
null //workflow
)) {
}
@ -916,22 +935,40 @@ function characterData($parser, $data) { /* {{{ */
$cur_reviewlog['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'USER':
$cur_user['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_user['attributes'][$current['attributes']['NAME']]))
$cur_user['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_user['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'GROUP':
$cur_group['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_group['attributes'][$current['attributes']['NAME']]))
$cur_group['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_group['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'ATTRIBUTEDEFINITION':
$cur_attrdef['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_attrdef['attributes'][$current['attributes']['NAME']]))
$cur_attrdef['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_attrdef['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'DOCUMENTCATEGORY':
$cur_documentcat['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_documentcat['attributes'][$current['attributes']['NAME']]))
$cur_documentcat['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_documentcat['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'KEYWORDCATEGORY':
$cur_keywordcat['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_keywordcat['attributes'][$current['attributes']['NAME']]))
$cur_keywordcat['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_keywordcat['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'KEYWORD':
$cur_keyword['attributes'][$current['attributes']['NAME']] = $data;
if(isset($cur_keyword['attributes'][$current['attributes']['NAME']]))
$cur_keyword['attributes'][$current['attributes']['NAME']] .= $data;
else
$cur_keyword['attributes'][$current['attributes']['NAME']] = $data;
break;
case 'IMAGE':
$cur_user['image']['mimetype'] = $data;