[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16264] Stable: Merge 16262:16263 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16264] Stable: Merge 16262:16263 from trunk |
|
Date: |
Tue, 7 Feb 2017 07:19:46 -0500 (EST) |
Revision: 16264
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16264
Author: sigurdne
Date: 2017-02-07 07:19:46 -0500 (Tue, 07 Feb 2017)
Log Message:
-----------
Stable: Merge 16262:16263 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK_vedlegg.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-07 12:18:01 UTC (rev 16263)
+++ branches/Version-2_0-branch 2017-02-07 12:19:46 UTC (rev 16264)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16188
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263
\ No newline at end of property
Modified:
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-02-07 12:18:01 UTC (rev 16263)
+++
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-02-07 12:19:46 UTC (rev 16264)
@@ -107,7 +107,7 @@
}
}
- if (is_writable("{$dirname}/archive"))
+ if (is_writable("{$dirname}/arkiv"))
{
foreach ($file_list as $file)
{
@@ -125,7 +125,7 @@
// move file
$_file = basename($file);
$movefrom =
"{$dirname}/{$_file}";
- $moveto =
"{$dirname}/archive/{$_file}";
+ $moveto =
"{$dirname}/arkiv/{$_file}";
if (is_file($moveto))
{
@@ -151,7 +151,7 @@
}
else
{
- $this->receipt['error'][] = array('msg' =>
"Arkiv katalog '{$dirname}/archive/' ikke er ikke skrivbar - kontakt
systemadminstrator for å korrigere");
+ $this->receipt['error'][] = array('msg' =>
"Arkiv katalog '{$dirname}/arkiv/' ikke er ikke skrivbar - kontakt
systemadminstrator for å korrigere");
}
$this->remind();
@@ -238,6 +238,96 @@
$password =
$this->config->config_data['common']['password'];
$directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'], '/');
$directory_local =
rtrim($this->config->config_data['import']['local_path'], '/');
+
+
+ try
+ {
+ $connection = ftp_connect($server);
+ }
+ catch (Exception $e)
+ {
+ $this->receipt['error'][] = array('msg' =>
$e->getMessage());
+ }
+
+ // try to authenticate with username root, password
secretpassword
+ if (!ftp_login($connection, $user, $password))
+ {
+ echo "fail: unable to authenticate\n";
+ }
+ else
+ {
+ // allright, we're in!
+ echo "okay: logged in...<br/>";
+
+ if (!ftp_chdir($connection, $directory_remote))
+ {
+ echo ("Change Dir Failed:
$dir<BR>\r\n");
+ return false;
+ }
+
+ // Scan directory
+ $files = array();
+ echo "Scanning {$directory_remote}<br/>";
+
+ $files = ftp_nlist($connection, '.');
+
+ if ($this->debug)
+ {
+ _debug_array($files);
+ }
+
+ foreach ($files as $file_name)
+ {
+ if ($this->debug)
+ {
+
_debug_array('preg_match("/xml$/i",' . $file_name . ': ' .
preg_match('/xml$/i', $file_name));
+ }
+
+ if(preg_match('/^X205/i',
(string)$file_name ))
+ {
+ $file_remote = $file_name;
+ $file_local =
"{$directory_local}/{$file_name}";
+
+ if (ftp_get($connection,
$file_local, $file_remote, FTP_ASCII))
+ {
+ ftp_delete( $connection
, "arkiv/{$file_remote}");
+
+ if
(ftp_rename($connection, $file_remote, "arkiv/{$file_remote}"))
+ {
+ echo "File
remote: {$file_remote} was moved to archive: arkiv/{$file_remote}<br/>";
+ echo "File
remote: {$file_remote} was copied to local: $file_local<br/>";
+ }
+ else
+ {
+ echo "ERROR!
File remote: {$file_remote} failed to move from remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
+ if
(unlink($file_local))
+ {
+ echo
"Lokal file was deleted: {$file_local}<br/>";
+ }
+ }
+ }
+ else
+ {
+ echo "Feiler på
ftp_fget()<br/>";
+ }
+ }
+ }
+ }
+ }
+
+ protected function get_files_old()
+ {
+ $method =
$this->config->config_data['common']['method'];
+ if($method == 'local')
+ {
+ return;
+ }
+
+ $server = $this->config->config_data['common']['host'];
+ $user = $this->config->config_data['common']['user'];
+ $password =
$this->config->config_data['common']['password'];
+ $directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'], '/');
+ $directory_local =
rtrim($this->config->config_data['import']['local_path'], '/');
$port = 22;
if (!function_exists("ssh2_connect"))
@@ -314,17 +404,17 @@
if (fclose($fp))
{
echo
"File remote: {$file_remote} was copied to local: $file_local<br/>";
- if
(ssh2_sftp_unlink($sftp, "{$directory_remote}/archive/{$file_name}"))
+ if
(ssh2_sftp_unlink($sftp, "{$directory_remote}/arkiv/{$file_name}"))
{
-
echo "Deleted duplicate File remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "Deleted duplicate File remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
}
- if
(ssh2_sftp_rename($sftp, $file_remote,
"{$directory_remote}/archive/{$file_name}"))
+ if
(ssh2_sftp_rename($sftp, $file_remote,
"{$directory_remote}/arkiv/{$file_name}"))
{
-
echo "File remote: {$file_remote} was moved to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "File remote: {$file_remote} was moved to remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
}
else
{
-
echo "ERROR! File remote: {$file_remote} failed to move to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "ERROR! File remote: {$file_remote} failed to move to remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
if (unlink($file_local))
{
echo "Lokal file was deleted: {$file_local}<br/>";
Modified:
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK_vedlegg.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK_vedlegg.php
2017-02-07 12:18:01 UTC (rev 16263)
+++
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK_vedlegg.php
2017-02-07 12:19:46 UTC (rev 16264)
@@ -75,7 +75,7 @@
}
}
- if (is_writable("{$dirname}/archive"))
+ if (is_writable("{$dirname}/arkiv"))
{
foreach ($file_list as $file)
{
@@ -90,7 +90,7 @@
// move file
$_file = basename($file);
$movefrom =
"{$dirname}/{$_file}";
- $moveto =
"{$dirname}/archive/{$_file}";
+ $moveto =
"{$dirname}/arkiv/{$_file}";
if (is_file($moveto))
{
@@ -111,12 +111,11 @@
}
else
{
- $this->receipt['error'][] = array('msg' =>
"Arkiv katalog '{$dirname}/archive/' ikke er ikke skrivbar - kontakt
systemadminstrator for å korrigere");
+ $this->receipt['error'][] = array('msg' =>
"Arkiv katalog '{$dirname}/arkiv/' ikke er ikke skrivbar - kontakt
systemadminstrator for å korrigere");
}
}
-
protected function get_files()
{
$method =
$this->config->config_data['common']['method'];
@@ -130,6 +129,95 @@
$password =
$this->config->config_data['common']['password'];
$directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'], '/');
$directory_local =
rtrim($this->config->config_data['import']['local_path'], '/');
+
+
+ try
+ {
+ $connection = ftp_connect($server);
+ }
+ catch (Exception $e)
+ {
+ $this->receipt['error'][] = array('msg' =>
$e->getMessage());
+ }
+
+ // try to authenticate with username root, password
secretpassword
+ if (!ftp_login($connection, $user, $password))
+ {
+ echo "fail: unable to authenticate\n";
+ }
+ else
+ {
+ // allright, we're in!
+ echo "okay: logged in...<br/>";
+
+ if (!ftp_chdir($connection, $directory_remote))
+ {
+ echo ("Change Dir Failed:
$dir<BR>\r\n");
+ return false;
+ }
+
+ // Scan directory
+ $files = array();
+ echo "Scanning {$directory_remote}<br/>";
+
+ $files = ftp_nlist($connection, '.');
+
+ if ($this->debug)
+ {
+ _debug_array($files);
+ }
+
+ foreach ($files as $file_name)
+ {
+ if ($this->debug)
+ {
+
_debug_array('preg_match("/xml$/i",' . $file_name . ': ' .
preg_match('/xml$/i', $file_name));
+ }
+
+ if(preg_match('/^Portico/i',
(string)$file_name ))
+ {
+ $file_remote = $file_name;
+ $file_local =
"{$directory_local}/{$file_name}";
+
+ if (ftp_get($connection,
$file_local, $file_remote, FTP_ASCII))
+ {
+ ftp_delete( $connection
, "arkiv/{$file_remote}");
+ if
(ftp_rename($connection, $file_remote, "arkiv/{$file_remote}"))
+ {
+ echo "File
remote: {$file_remote} was moved to archive: arkiv/{$file_remote}<br/>";
+ echo "File
remote: {$file_remote} was copied to local: $file_local<br/>";
+ }
+ else
+ {
+ echo "ERROR!
File remote: {$file_remote} failed to move from remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
+ if
(unlink($file_local))
+ {
+ echo
"Lokal file was deleted: {$file_local}<br/>";
+ }
+ }
+ }
+ else
+ {
+ echo "Feiler på
ftp_fget()<br/>";
+ }
+ }
+ }
+ }
+ }
+
+ protected function get_files_old()
+ {
+ $method =
$this->config->config_data['common']['method'];
+ if($method == 'local')
+ {
+ return;
+ }
+
+ $server = $this->config->config_data['common']['host'];
+ $user = $this->config->config_data['common']['user'];
+ $password =
$this->config->config_data['common']['password'];
+ $directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'], '/');
+ $directory_local =
rtrim($this->config->config_data['import']['local_path'], '/');
$port = 22;
if (!function_exists("ssh2_connect"))
@@ -206,17 +294,17 @@
if (fclose($fp))
{
echo
"File remote: {$file_remote} was copied to local: $file_local<br/>";
- if
(ssh2_sftp_unlink($sftp, "{$directory_remote}/archive/{$file_name}"))
+ if
(ssh2_sftp_unlink($sftp, "{$directory_remote}/arkiv/{$file_name}"))
{
-
echo "Deleted duplicate File remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "Deleted duplicate File remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
}
- if
(ssh2_sftp_rename($sftp, $file_remote,
"{$directory_remote}/archive/{$file_name}"))
+ if
(ssh2_sftp_rename($sftp, $file_remote,
"{$directory_remote}/arkiv/{$file_name}"))
{
-
echo "File remote: {$file_remote} was moved to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "File remote: {$file_remote} was moved to remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
}
else
{
-
echo "ERROR! File remote: {$file_remote} failed to move to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "ERROR! File remote: {$file_remote} failed to move to remote:
{$directory_remote}/arkiv/{$file_name}<br/>";
if (unlink($file_local))
{
echo "Lokal file was deleted: {$file_local}<br/>";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16264] Stable: Merge 16262:16263 from trunk,
sigurdne <=