Peter M. Groen / knowledgetree

Commit 922129b19250acd36b404974c9c889a43edcc229

Authored by donaldjackson
1 parent 12c2259b

Updated ktapi

Inline Side-by-side
Showing 1 changed file with 89 additions and 62 deletions
ktapi/ktapi.inc.php
  View file @922129b
... ... @@ -1037,7 +1037,8 @@ class KTAPI
1037 1037 }
1038 1038  
1039 1039 $session= $session->get_session();
1040   - $response['message'] = $session;
  1040 + $response['results'] = $session;
  1041 + $response['message'] = '';
1041 1042  
1042 1043 $response['status_code'] = 0;
1043 1044 return $response;
... ... @@ -1064,7 +1065,8 @@ class KTAPI
1064 1065  
1065 1066 $session = $session->get_session();
1066 1067 $response['status_code'] = 0;
1067   - $response['message'] = $session;
  1068 + $response['message'] = '';
  1069 + $response['results'] = $session;
1068 1070 return $response;
1069 1071 }
1070 1072  
... ... @@ -1106,10 +1108,10 @@ class KTAPI
1106 1108 $response['message']= $folder->getMessage();
1107 1109 return $response;
1108 1110 }
1109   - $detail = $folder->get_detail();
1110   - $detail['status_code'] = 0;
1111   - $detail['message'] = '';
1112   - return $detail;
  1111 + $response['status_code'] = 0;
  1112 + $response['message'] = '';
  1113 + $response['results'] = $folder->get_detail();
  1114 + return $response;
1113 1115 }
1114 1116  
1115 1117 /**
... ... @@ -1139,7 +1141,7 @@ class KTAPI
1139 1141  
1140 1142 $response['status_code'] = 0;
1141 1143 $response['message'] = '';
1142   - $response['shortcuts'] = $shortcuts;
  1144 + $response['results'] = $shortcuts;
1143 1145 return $response;
1144 1146 }
1145 1147  
... ... @@ -1160,10 +1162,10 @@ class KTAPI
1160 1162 return $response;
1161 1163 }
1162 1164  
1163   - $detail = $folder->get_detail();
1164   - $detail['status_code'] = 0;
1165   - $detail['message'] = '';
1166   - return $detail;
  1165 + $response['status_code'] = 0;
  1166 + $response['message'] = '';
  1167 + $response['results'] = $folder->get_detail();
  1168 + return $response;
1167 1169 }
1168 1170  
1169 1171 /**
... ... @@ -1193,10 +1195,11 @@ class KTAPI
1193 1195 'items'=>$listing
1194 1196 );
1195 1197  
1196   - $contents['status_code'] = 0;
1197   - $contents['message'] = '';
  1198 + $response['status_code'] = 0;
  1199 + $response['message'] = '';
  1200 + $response['results'] = $contents;
1198 1201  
1199   - return $contents;
  1202 + return $response;
1200 1203 }
1201 1204  
1202 1205 /**
... ... @@ -1215,11 +1218,11 @@ class KTAPI
1215 1218 $response['message']= $folder->getMessage();
1216 1219 return $response;
1217 1220 }
1218   - $newfolder = &$folder->add_folder($folder_name);
1219   - $detail = $newfolder->get_detail();
1220   - $detail['status_code'] = 0;
1221   - $detail['message'] = '';
1222   - return $detail;
  1221 + $newfolder = $folder->add_folder($folder_name);
  1222 + $response['status_code'] = 0;
  1223 + $response['message'] = '';
  1224 + $response['results'] = $newfolder->get_detail();
  1225 + return $response;
1223 1226 }
1224 1227  
1225 1228 /**
... ... @@ -1239,7 +1242,7 @@ class KTAPI
1239 1242 return $response;
1240 1243 }
1241 1244  
1242   - $source_folder = &$kt->get_folder_by_id($source_folder_id);
  1245 + $source_folder = &$this->get_folder_by_id($source_folder_id);
1243 1246 if (PEAR::isError($source_folder))
1244 1247 {
1245 1248 $response['status_code'] = 1;
... ... @@ -1255,10 +1258,10 @@ class KTAPI
1255 1258 return $response;
1256 1259 }
1257 1260  
1258   - $detail = $shortcut->get_detail();
1259   - $detail['status_code'] = 0;
1260   - $detail['message'] = '';
1261   - return $detail;
  1261 + $response['status_code'] = 0;
  1262 + $response['message'] = '';
  1263 + $response['results'] = $shortcut->get_detail();
  1264 + return $response;
1262 1265 }
1263 1266  
1264 1267 /**
... ... @@ -1278,7 +1281,7 @@ class KTAPI
1278 1281 return $response;
1279 1282 }
1280 1283  
1281   - $source_document = &$kt->get_document_by_id($source_document_id);
  1284 + $source_document = &$this->get_document_by_id($source_document_id);
1282 1285 if (PEAR::isError($source_document))
1283 1286 {
1284 1287 $response['status_code'] = 1;
... ... @@ -1294,10 +1297,10 @@ class KTAPI
1294 1297 return $response;
1295 1298 }
1296 1299  
1297   - $detail = $shortcut->get_detail();
1298   - $detail['status_code'] = 0;
1299   - $detail['message'] = '';
1300   - return $detail;
  1300 + $response['status_code'] = 0;
  1301 + $response['message'] = '';
  1302 + $response['results'] = $shortcut->get_detail();
  1303 + return $response;
1301 1304 }
1302 1305  
1303 1306 /**
... ... @@ -1391,15 +1394,16 @@ class KTAPI
1391 1394 return $response;
1392 1395 }
1393 1396  
  1397 + $response['status_code'] = 0;
  1398 +
1394 1399 if($this->version >= 2){
1395 1400 $sourceName = $src_folder->get_folder_name();
1396 1401 $targetPath = $tgt_folder->get_full_path();
1397 1402  
1398   - $response = $this->get_folder_detail_by_name($targetPath . '/' . $sourceName);
  1403 + $response['results'] = $this->get_folder_detail_by_name($targetPath . '/' . $sourceName);
1399 1404 return $response;
1400 1405 }
1401 1406  
1402   - $response['status_code'] = 0;
1403 1407 return $response;
1404 1408 }
1405 1409  
... ... @@ -1437,12 +1441,13 @@ class KTAPI
1437 1441 return $response;
1438 1442 }
1439 1443  
  1444 + $response['status_code'] = 0;
  1445 +
1440 1446 if($this->version >= 2){
1441   - $response = $this->get_folder_detail($source_id);
  1447 + $response['results'] = $this->get_folder_detail($source_id);
1442 1448 return $response;
1443 1449 }
1444 1450  
1445   - $response['status_code'] = 0;
1446 1451 return $response;
1447 1452  
1448 1453 }
... ... @@ -1464,12 +1469,29 @@ class KTAPI
1464 1469 }
1465 1470  
1466 1471 $response['status_code']= 0;
1467   - $response['document_types']= $result;
  1472 + $response['results']= $result;
1468 1473  
1469 1474 return $response;
1470 1475  
1471 1476 }
1472 1477  
  1478 + public function get_document_link_types_list($session_id)
  1479 + {
  1480 + $result = $this->get_document_link_types();
  1481 + if (PEAR::isError($result))
  1482 + {
  1483 + $response['status_code'] = 1;
  1484 + $response['message']= $result->getMessage();
  1485 +
  1486 + return $response;
  1487 + }
  1488 +
  1489 + $response['status_code']= 0;
  1490 + $response['results'] = $result;
  1491 +
  1492 + return $response;
  1493 +
  1494 + }
1473 1495  
1474 1496 /**
1475 1497 * Returns document detail given a document_id.
... ... @@ -1484,6 +1506,7 @@ class KTAPI
1484 1506 {
1485 1507 $response['status_code'] = 1;
1486 1508 $response['message']= $document->getMessage();
  1509 + return $response;
1487 1510 }
1488 1511  
1489 1512 $detail = $document->get_detail();
... ... @@ -1491,10 +1514,11 @@ class KTAPI
1491 1514 {
1492 1515 $response['status_code'] = 1;
1493 1516 $response['message']= $detail->getMessage();
  1517 + return $response;
1494 1518 }
1495 1519  
1496   - $detail['status_code'] = 0;
1497   - $detail['message'] = '';
  1520 + $response['status_code'] = 0;
  1521 + $response['message'] = '';
1498 1522  
1499 1523 if ($this->version >= 2)
1500 1524 {
... ... @@ -1507,40 +1531,41 @@ class KTAPI
1507 1531 if (stripos($detailstr,'M') !== false)
1508 1532 {
1509 1533 $response = $this->get_document_metadata($document_id);
1510   - $detail['metadata'] = $response['metadata'];
  1534 + $detail['metadata'] = $response['results'];
1511 1535 $detail['name'] = 'metadata';
1512 1536 }
1513 1537  
1514 1538 if (stripos($detailstr,'L') !== false)
1515 1539 {
1516 1540 $response = $this->get_document_links($document_id);
1517   - $detail['links'] = $response['links'];
  1541 + $detail['links'] = $response['results'];
1518 1542 $detail['name'] = 'links';
1519 1543 }
1520 1544  
1521 1545 if (stripos($detailstr,'T') !== false)
1522 1546 {
1523 1547 $response = $this->get_document_workflow_transitions($document_id);
1524   - $detail['transitions'] = $response['transitions'] ;
  1548 + $detail['transitions'] = $response['results'] ;
1525 1549 $detail['name'] = 'transitions';
1526 1550 }
1527 1551  
1528 1552 if (stripos($detailstr,'V') !== false)
1529 1553 {
1530 1554 $response = $this->get_document_version_history($document_id);
1531   - $detail['version_history'] = $response['history'];
  1555 + $detail['version_history'] = $response['results'];
1532 1556 $detail['name'] = 'version_history';
1533 1557 }
1534 1558  
1535 1559 if (stripos($detailstr,'H') !== false)
1536 1560 {
1537 1561 $response = $this->get_document_transaction_history($document_id);
1538   - $detail['transaction_history'] = $response['history'];
  1562 + $detail['transaction_history'] = $response['results'];
1539 1563 $detail['name'] = 'transaction_history';
1540 1564 }
1541 1565 }
1542 1566  
1543   - return $detail;
  1567 + $response['results'] = $detail;
  1568 + return $response;
1544 1569 }
1545 1570  
1546 1571 function get_document_detail_by_filename($folder_id, $filename, $detail='')
... ... @@ -1626,7 +1651,7 @@ class KTAPI
1626 1651  
1627 1652 $response['status_code'] = 0;
1628 1653 $response['message'] = '';
1629   - $response['shortcuts'] = $shortcuts;
  1654 + $response['results'] = $shortcuts;
1630 1655 return $response;
1631 1656 }
1632 1657  
... ... @@ -1668,10 +1693,10 @@ class KTAPI
1668 1693 return $response;
1669 1694 }
1670 1695  
1671   - $detail = $document->get_detail();
1672   - $detail['status_code'] = 0;
1673   - $detail['message'] = '';
1674   - return $detail;
  1696 + $response['status_code'] = 0;
  1697 + $response['message'] = '';
  1698 + $response['results'] = $document->get_detail();
  1699 + return $response;
1675 1700 }
1676 1701  
1677 1702 function add_small_document_with_metadata($folder_id, $title, $filename, $documenttype, $base64, $metadata, $sysdata)
... ... @@ -1682,7 +1707,7 @@ class KTAPI
1682 1707 return $add_result;
1683 1708 }
1684 1709  
1685   - $document_id = $add_result->value['document_id'];
  1710 + $document_id = $add_result['results']['document_id'];
1686 1711  
1687 1712 $update_result = $this->update_document_metadata($document_id, $metadata, $sysdata);
1688 1713 if($update_result['status_code'] != 0){
... ... @@ -1713,7 +1738,7 @@ class KTAPI
1713 1738 return $add_result;
1714 1739 }
1715 1740  
1716   - $document_id = $add_result->value['document_id'];
  1741 + $document_id = $add_result['results']['document_id'];
1717 1742  
1718 1743 $update_result = $this->update_document_metadata($document_id, $metadata, $sysdata);
1719 1744 if($update_result['status_code'] != 0){
... ... @@ -1763,7 +1788,7 @@ class KTAPI
1763 1788 $response=array();
1764 1789 $response['status_code'] = 0;
1765 1790 $response['message'] = empty($collection) ? _kt('No documents were found matching the specified document no') : '';
1766   - $response['collection'] = $collection;
  1791 + $response['results'] = $collection;
1767 1792 return $collection;
1768 1793 }
1769 1794  
... ... @@ -1809,10 +1834,10 @@ class KTAPI
1809 1834 return $response;
1810 1835 }
1811 1836  
1812   - $detail = $document->get_detail();
1813   - $detail['status_code'] = 0;
1814   - $detail['message'] = '';
1815   - return $detail;
  1837 + $response['status_code'] = 0;
  1838 + $response['message'] = '';
  1839 + $response['results'] = $document->get_detail();
  1840 + return $response;
1816 1841 }
1817 1842  
1818 1843 /**
... ... @@ -1996,16 +2021,18 @@ class KTAPI
1996 2021 $url = $download_manager->allow_download($document);
1997 2022 }
1998 2023  
  2024 +
1999 2025 if ($this->version >= 2)
2000 2026 {
2001   - $result = $this->get_document_detail($session_id, $document_id);
2002   - $result['message'] = $url;
  2027 + $response = $this->get_document_detail($document_id);
  2028 + $response['results']['url'] = $url;
2003 2029  
2004   - return $result;
  2030 + return $response;
2005 2031 }
2006 2032  
2007 2033 $response['status_code'] = 0;
2008   - $response['message'] = $url;
  2034 + $response['message'] = '';
  2035 + $response['results'] = $url;
2009 2036  
2010 2037 return $response;
2011 2038 }
... ... @@ -2059,13 +2086,13 @@ class KTAPI
2059 2086 if ($this->version >= 2)
2060 2087 {
2061 2088 $result = $this->get_document_detail($document_id);
2062   - $result['message'] = $content;
  2089 + $result['results']['content'] = $content;
2063 2090  
2064 2091 return $result;
2065 2092 }
2066 2093  
2067 2094 $response['status_code'] = 0;
2068   - $response['message'] = $content;
  2095 + $response['results'] = $content;
2069 2096 return $response;
2070 2097 }
2071 2098  
... ... @@ -2134,7 +2161,7 @@ class KTAPI
2134 2161 $url = $download_manager->allow_download($document);
2135 2162  
2136 2163 $response['status_code'] = 0;
2137   - $response['message'] = $url;
  2164 + $response['results'] = $url;
2138 2165  
2139 2166 return $response;
2140 2167 }
... ... @@ -2183,7 +2210,7 @@ class KTAPI
2183 2210  
2184 2211  
2185 2212 $response['status_code'] = 0;
2186   - $response['message'] = $content;
  2213 + $response['results'] = $content;
2187 2214  
2188 2215 return $response;
2189 2216 }
... ...