FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

configdb - added function for handling binary files

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5681 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2014-04-27 18:01:14 +00:00
parent d0ec321243
commit b88f6b5092
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- SVN - SVN
- added: configDB functions for handling binary files
- feature: 02_RSS.pm: alpha channel for colors - feature: 02_RSS.pm: alpha channel for colors
- feature: JSONMETER: time depending tariffs added (activeTariff) - feature: JSONMETER: time depending tariffs added (activeTariff)
- updated: codemirror version 3.24 - updated: codemirror version 3.24

20
fhem/FHEM/98_configdb.pm
View File

@ -526,13 +526,21 @@ compare device: telnetPort in current version 0 (left) to version: 1 (right)
<br/> <br/>
<li><code>configdb fileimport &lt;sourceFilename&gt;</code></li><br/> <li><code>configdb fileimport &lt;sourceFilename&gt;</code></li><br/>
Imports specified fhem file from from filesystem into database.<br/> Imports specified text file from from filesystem into database.<br/>
Example:<br/> Example:<br/>
<br/> <br/>
<code>configdb fileimport FHEM/99_myUtils.pm</code><br/> <code>configdb fileimport FHEM/99_myUtils.pm</code><br/>
<br/> <br/>
<br/> <br/>
<li><code>configdb binfileimport &lt;sourceFilename&gt;</code></li><br/>
Imports specified binary file from from filesystem into database.<br/>
Example:<br/>
<br/>
<code>configdb binfileimport www/images/bla.png</code><br/>
<br/>
<br/>
<li><code>configdb filelist</code></li><br/> <li><code>configdb filelist</code></li><br/>
Show a list with all filenames stored in database.<br/> Show a list with all filenames stored in database.<br/>
<br/> <br/>
@ -836,13 +844,21 @@ compare device: telnetPort in current version 0 (left) to version: 1 (right)
<br/> <br/>
<li><code>configdb fileimport &lt;quellDatei&gt;</code></li><br/> <li><code>configdb fileimport &lt;quellDatei&gt;</code></li><br/>
Liest die angegbene Datei aus dem Dateisystem und schreibt den Inhalt in die Datenbank.<br/> Liest die angegbene Textdatei aus dem Dateisystem und schreibt den Inhalt in die Datenbank.<br/>
Beispiel:<br/> Beispiel:<br/>
<br/> <br/>
<code>configdb fileimport FHEM/99_myUtils.pm</code><br/> <code>configdb fileimport FHEM/99_myUtils.pm</code><br/>
<br/> <br/>
<br/> <br/>
<li><code>configdb binfileimport &lt;quellDatei&gt;</code></li><br/>
Liest die angegbene Bin&auml;rdatei aus dem Dateisystem und schreibt den Inhalt in die Datenbank.<br/>
Beispiel:<br/>
<br/>
<code>configdb binfileimport www/images/bla.png</code><br/>
<br/>
<br/>
<li><code>configdb filelist</code></li><br/> <li><code>configdb filelist</code></li><br/>
Liefert eine Liste mit allen Namen der gespeicherten Dateien.<br/> Liefert eine Liste mit allen Namen der gespeicherten Dateien.<br/>
<br/> <br/>

8
fhem/configDB.pm
View File

@ -71,6 +71,8 @@
# 2014-04-26 - added migration to generic file handling # 2014-04-26 - added migration to generic file handling
# fixed problem on migration of multiline DEFs # fixed problem on migration of multiline DEFs
# #
# 2014-04-27 - added new functions for binfile handling
#
############################################################################## ##############################################################################
# #
@ -728,8 +730,8 @@ sub _cfgDB_Diff($$) {
################################################## ##################################################
# functions used for file handling # functions used for file handling
# #
# delete file from database
# find dbtable for file
sub _cfgDB_Filefind($) { sub _cfgDB_Filefind($) {
my ($filename) = @_; my ($filename) = @_;
my $fhem_dbh = _cfgDB_Connect; my $fhem_dbh = _cfgDB_Connect;
@ -745,6 +747,7 @@ sub _cfgDB_Filefind($) {
return $retfile; return $retfile;
} }
# delete file from database
sub _cfgDB_Filedelete($) { sub _cfgDB_Filedelete($) {
my ($filename) = @_; my ($filename) = @_;
my $dbtable = _cfgDB_Filefind($filename); my $dbtable = _cfgDB_Filefind($filename);
@ -798,7 +801,7 @@ sub _cfgDB_Fileexport($) {
return "$counter $sunit written from database into file $filename"; return "$counter $sunit written from database into file $filename";
} }
# import file from filesystem into database # import text-file into database
sub _cfgDB_Fileimport($;$) { sub _cfgDB_Fileimport($;$) {
my ($filename,$doDelete) = @_; my ($filename,$doDelete) = @_;
$doDelete = (defined($doDelete)) ? 1 : 0; $doDelete = (defined($doDelete)) ? 1 : 0;
@ -820,6 +823,7 @@ sub _cfgDB_Fileimport($;$) {
return "$counter lines written from file $filename to database"; return "$counter lines written from file $filename to database";
} }
# import bin-file into database
sub _cfgDB_binFileimport($;$) { sub _cfgDB_binFileimport($;$) {
my ($filename,$filesize,$doDelete) = @_; my ($filename,$filesize,$doDelete) = @_;
$doDelete = (defined($doDelete)) ? 1 : 0; $doDelete = (defined($doDelete)) ? 1 : 0;