dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove message 'expandtemplates-desc'
[lhc/web/wiklou.git]
/
maintenance
/
cdb.php
diff --git
a/maintenance/cdb.php
b/maintenance/cdb.php
index
c06c2cd
..
bda64f3
100644
(file)
--- a/
maintenance/cdb.php
+++ b/
maintenance/cdb.php
@@
-23,12
+23,12
@@
*/
/** */
*/
/** */
-require_once
( __DIR__ . '/commandLine.inc' )
;
+require_once
__DIR__ . '/commandLine.inc'
;
function cdbShowHelp( $command ) {
$commandList = array(
'load' => 'load a cdb file for reading',
function cdbShowHelp( $command ) {
$commandList = array(
'load' => 'load a cdb file for reading',
- 'get'
=> 'get a value for a key',
+ 'get' => 'get a value for a key',
'exit' => 'exit cdb',
'quit' => 'exit cdb',
'help' => 'help about a command',
'exit' => 'exit cdb',
'quit' => 'exit cdb',
'help' => 'help about a command',
@@
-55,7
+55,9
@@
do {
static $fileHandle;
$line = Maintenance::readconsole();
static $fileHandle;
$line = Maintenance::readconsole();
- if ( $line === false ) exit;
+ if ( $line === false ) {
+ exit;
+ }
$args = explode( ' ', $line );
$command = array_shift( $args );
$args = explode( ' ', $line );
$command = array_shift( $args );
@@
-67,29
+69,36
@@
do {
cdbShowHelp( array_shift( $args ) );
break;
case 'load':
cdbShowHelp( array_shift( $args ) );
break;
case 'load':
- if( !isset( $args[0] ) ) {
+ if
( !isset( $args[0] ) ) {
print "Need a filename there buddy\n";
break;
}
$file = $args[0];
print "Loading cdb file $file...";
print "Need a filename there buddy\n";
break;
}
$file = $args[0];
print "Loading cdb file $file...";
- $fileHandle = CdbReader::open( $file );
- if( !$fileHandle ) {
+ try {
+ $fileHandle = CdbReader::open( $file );
+ } catch( CdbException $e ) {}
+
+ if ( !$fileHandle ) {
print "not a cdb file or unable to read it\n";
} else {
print "ok\n";
}
break;
case 'get':
print "not a cdb file or unable to read it\n";
} else {
print "ok\n";
}
break;
case 'get':
- if( !$fileHandle ) {
+ if
( !$fileHandle ) {
print "Need to load a cdb file first\n";
break;
}
print "Need to load a cdb file first\n";
break;
}
- if( !isset( $args[0] ) ) {
+ if
( !isset( $args[0] ) ) {
print "Need to specify a key, Luke\n";
break;
}
print "Need to specify a key, Luke\n";
break;
}
- $res = $fileHandle->get( $args[0] );
+ try {
+ $res = $fileHandle->get( $args[0] );
+ } catch ( CdbException $e ) {
+ print "Unable to read key from file\n";
+ }
if ( $res === false ) {
print "No such key/value pair\n";
} elseif ( is_string( $res ) ) {
if ( $res === false ) {
print "No such key/value pair\n";
} elseif ( is_string( $res ) ) {