@@ -186,15 +186,11 @@ public void actionPerformed(ActionEvent e) {
186186Class .forName ("org.postgresql.Driver" );
187187
188188// Connect to database
189- System .out .println ("Connecting to Database URL = " +url );
190189db =DriverManager .getConnection (url ,user ,password );
191190
192191// Create a statement
193192stat =db .createStatement ();
194193
195- // Set the connection to use transactions
196- db .setAutoCommit (false );
197-
198194// Also, get the LargeObjectManager for this connection
199195lom = ((org .postgresql .Connection )db ).getLargeObjectAPI ();
200196
@@ -210,7 +206,7 @@ public void actionPerformed(ActionEvent e) {
210206public void init ()
211207 {
212208try {
213- db .setAutoCommit (true );
209+ // db.setAutoCommit(true);
214210stat .executeUpdate ("create table images (imgname name,imgoid oid)" );
215211label .setText ("Initialised database" );
216212db .commit ();
@@ -219,11 +215,11 @@ public void init()
219215 }
220216
221217// This must run outside the previous try{} catch{} segment
222- try {
223- db .setAutoCommit (true );
224- }catch (SQLException ex ) {
225- label .setText (ex .toString ());
226- }
218+ // try {
219+ // db.setAutoCommit(true);
220+ // } catch(SQLException ex) {
221+ // label.setText(ex.toString());
222+ // }
227223 }
228224
229225/**
@@ -283,37 +279,29 @@ public void run() {
283279// fetch the large object manager
284280LargeObjectManager lom = ((org .postgresql .Connection )db ).getLargeObjectAPI ();
285281
286- System .out .println ("Importing file" );
282+ db .setAutoCommit (false );
283+
287284// A temporary buffer - this can be as large as you like
288285byte buf [] =new byte [2048 ];
289286
290287// Open the file
291- System .out .println ("Opening file " +dir +"/" +name );
292288FileInputStream fis =new FileInputStream (new File (dir ,name ));
293289
294- // Gain access to large objects
295- System .out .println ("Gaining LOAPI" );
296-
297290// Now create the large object
298- System .out .println ("creating blob" );
299291int oid =lom .create ();
300-
301- System .out .println ("Opening " +oid );
302292LargeObject blob =lom .open (oid );
303293
304294// Now copy the file into the object.
305295//
306296// Note: we dont use write(buf), as the last block is rarely the same
307297// size as our buffer, so we have to use the amount read.
308- System .out .println ("Importing file" );
309298int s ,t =0 ;
310299while ((s =fis .read (buf ,0 ,buf .length ))>0 ) {
311- System . out . println ( "Block s=" + s + " t=" + t ); t +=s ;
300+ t +=s ;
312301blob .write (buf ,0 ,s );
313302 }
314303
315304// Close the object
316- System .out .println ("Closing blob" );
317305blob .close ();
318306
319307// Now store the entry into the table
@@ -323,6 +311,7 @@ public void run() {
323311stat =db .createStatement ();
324312stat .executeUpdate ("insert into images values ('" +name +"'," +oid +")" );
325313db .commit ();
314+ db .setAutoCommit (false );
326315
327316// Finally refresh the names list, and display the current image
328317ImageViewer .this .refreshList ();
@@ -370,26 +359,28 @@ public void refreshList()
370359public void removeImage ()
371360 {
372361try {
362+ //
373363// Delete any large objects for the current name
364+ //
365+ // Note: We don't need to worry about being in a transaction
366+ // here, because we are not opening any blobs, only deleting
367+ // them
368+ //
374369ResultSet rs =stat .executeQuery ("select imgoid from images where imgname='" +currentImage +"'" );
375370if (rs !=null ) {
376371// Even though there should only be one image, we still have to
377372// cycle through the ResultSet
378373while (rs .next ()) {
379- System .out .println ("Got oid " +rs .getInt (1 ));
380374lom .delete (rs .getInt (1 ));
381- System .out .println ("Import complete" );
382375}
383376 }
384377rs .close ();
385378
386379// Finally delete any entries for that name
387380stat .executeUpdate ("delete from images where imgname='" +currentImage +"'" );
388- db .commit ();
389381
390382label .setText (currentImage +" deleted" );
391383currentImage =null ;
392- db .commit ();
393384refreshList ();
394385 }catch (SQLException ex ) {
395386label .setText (ex .toString ());
@@ -404,21 +395,30 @@ public void removeImage()
404395public void displayImage (String name )
405396 {
406397try {
407- System .out .println ("Selecting oid for " +name );
398+ //
399+ // Now as we are opening and reading a large object we must
400+ // turn on Transactions. This includes the ResultSet.getBytes()
401+ // method when it's used on a field of type oid!
402+ //
403+ db .setAutoCommit (false );
404+
408405ResultSet rs =stat .executeQuery ("select imgoid from images where imgname='" +name +"'" );
409406if (rs !=null ) {
410407// Even though there should only be one image, we still have to
411408// cycle through the ResultSet
412409while (rs .next ()) {
413- System .out .println ("Got oid " +rs .getInt (1 ));
414410canvas .setImage (canvas .getToolkit ().createImage (rs .getBytes (1 )));
415- System .out .println ("Import complete" );
416411label .setText (currentImage =name );
417412}
418413 }
419414rs .close ();
420415 }catch (SQLException ex ) {
421416label .setText (ex .toString ());
417+ }finally {
418+ try {
419+ db .setAutoCommit (true );
420+ }catch (SQLException ex2 ) {
421+ }
422422 }
423423 }
424424
@@ -454,6 +454,7 @@ public static void main(String args[])
454454frame .setLayout (new BorderLayout ());
455455ImageViewer viewer =new ImageViewer (frame ,args [0 ],args [1 ],args [2 ]);
456456frame .pack ();
457+ frame .setLocation (0 ,50 );
457458frame .setVisible (true );
458459 }catch (Exception ex ) {
459460System .err .println ("Exception caught.\n " +ex );
