/[drupal]/contributions/modules/import_html/import_html.module
ViewVC logotype

Log of /contributions/modules/import_html/import_html.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Tag:

Revision 1.71.2.16 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Oct 6 14:09:02 2009 UTC (7 weeks, 1 day ago) by dman
Branch: DRUPAL-6--1
CVS Tags: DRUPAL-6--1-0
Changes since 1.71.2.15: +63 -63 lines
Diff to previous 1.71.2.15 , to branch point 1.71 , to next main 1.72
tidied up line endings and whitespace

Revision 1.71.2.15 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 1 02:40:56 2009 UTC (4 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.14: +2 -2 lines
Diff to previous 1.71.2.14 , to branch point 1.71
some wording changes, some classes on some of the messages for formatting and layout. Changed 'proceed to import' into a big button instead of a little link. reviewed handling for menu/URL building when being created from root. Ongoing renaming of the 'debug' routine into the database log version instead

Revision 1.71.2.14 - (view) (download) (as text) (annotate) - [select for diffs]
Sun May 17 15:12:46 2009 UTC (6 months, 1 week ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.13: +16 -7 lines
Diff to previous 1.71.2.13 , to branch point 1.71
OK!
I'm using the simpletest framework
It's not much fun to debug
But it did throw up a few issues that fresh-install first-time users may hit, and I think It's helped make the code better already.
BUT it has a small aneurism when trying to use the test framework batch process to run the import_html batch process.
It actually works, but throws a batch error.

More simpletest test cases to come - for alternative templates and importantly - for CCK.
I'm only working through this test framework so I can automate and DETECT WHEN OTHER MODULES HAVE CHANGED THINGS that I didn't know about.

Revision 1.71.2.13 - (view) (download) (as text) (annotate) - [select for diffs]
Mon May 11 04:28:12 2009 UTC (6 months, 2 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.12: +2 -2 lines
Diff to previous 1.71.2.12 , to branch point 1.71
avoid a division by zero when displaying diagnostic logs

Revision 1.71.2.12 - (view) (download) (as text) (annotate) - [select for diffs]
Sat May 9 14:16:30 2009 UTC (6 months, 2 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.11: +2 -2 lines
Diff to previous 1.71.2.11 , to branch point 1.71
Moved further bits from onscreen dubug into watchdog - now verbose logging goes there too.
Removed bits of PHP4 support, soon can remove the abstraction library altogether

Revision 1.71.2.11 - (view) (download) (as text) (annotate) - [select for diffs]
Sat May 9 12:45:15 2009 UTC (6 months, 2 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.10: +71 -10 lines
Diff to previous 1.71.2.10 , to branch point 1.71
Moved heaps of the debug into watchdog!
now it should handle huge imports better
Added a log review page to display all recent import summary.
Added detection and attempted fix for the max_allowed_packets issue

code style review 100%

UNSTABLE

Revision 1.71.2.10 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 7 00:22:58 2009 UTC (6 months, 2 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.9: +7 -2 lines
Diff to previous 1.71.2.9 , to branch point 1.71
attempt at better behaviour on recursive jobs. Minor fix to a debug message that was listing files as dirs, fix to UI to assist multistep and not forget settings from other pages, removed excessive messages about recusion depth. Still many, but they are shorter. Handle the case (depth 0) where the working directory itself has just too many items. Display just one checkbox. outstanding- STILL probably needs a decent max_allowed_packets in mysql.ini - will try to add a warning if I can detect this issue.

Revision 1.71.2.9 - (view) (download) (as text) (annotate) - [select for diffs]
Wed May 6 03:25:11 2009 UTC (6 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.8: +2 -1 lines
Diff to previous 1.71.2.8 , to branch point 1.71
UI tweaks. Bogus menu item was missing a title, collapsed fieldsets crunch up in some themes

Revision 1.71.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Sun May 3 15:58:32 2009 UTC (6 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.7: +63 -20 lines
Diff to previous 1.71.2.7 , to branch point 1.71
HUGE rewrite of the batch process to handle huge directory listings. Significant rewrite (hopfully simplifying) the treeview builder. Trying to lighten up the messages, at least make them less cryptic. Batch and bulk modes now working well.

Revision 1.71.2.7 - (view) (download) (as text) (annotate) - [select for diffs]
Fri May 1 16:21:36 2009 UTC (6 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.6: +5 -4 lines
Diff to previous 1.71.2.6 , to branch point 1.71
CCK seems to work. Assorted refineimnets and softer error handling.

Revision 1.71.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Apr 30 13:17:00 2009 UTC (6 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.5: +1 -5 lines
Diff to previous 1.71.2.5 , to branch point 1.71
Starting to clear out the scaffolding and old comments. Formatting docs. Still to do - CCK and character encoding

Revision 1.71.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Apr 30 02:40:19 2009 UTC (6 months, 3 weeks ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.4: +2 -1 lines
Diff to previous 1.71.2.4 , to branch point 1.71
Various parsing tweaks.
Added full support for keywords to become tags
Mostly making the demo screen work nicer
Can do a full preview in demo mode

Revision 1.71.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Apr 26 17:00:34 2009 UTC (7 months ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.3: +17 -12 lines
Diff to previous 1.71.2.3 , to branch point 1.71
It's working again!!!
haven't tested CCK yet ...
Still may have some verbose debug messages coming through - may crash without devel.module
But i finally slaughtered the menu builder, by creating empty placeholder nodes. Not sure how clever that is.

Revision 1.71.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Apr 26 02:06:19 2009 UTC (7 months ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.2: +2 -2 lines
Diff to previous 1.71.2.2 , to branch point 1.71
Moved help docs into 'help' subfolder (not 'docs') for compatibility with advanced_help.module
Rewrote a few paragraphs, and updated links in help doc.
Need to remove docs dir altogether now

Revision 1.71.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Apr 15 17:09:46 2009 UTC (7 months, 1 week ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71.2.1: +124 -18 lines
Diff to previous 1.71.2.1 , to branch point 1.71
Huge steps forward.
Got most of the UI working under the new FAPI and multistep.
Now using batch processing!

Form validation is now per-element. Form submit is now ber button.

Only thing to fix is the actual page analysis itself!
At least THAT has no direct dependancies on the D6 upgrade issues!

I'm dropping PHP4 support, and seeing how many of the handmade library routines I can discard too.

Revision 1.55.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Mar 18 12:27:33 2009 UTC (8 months, 1 week ago) by dman
Branch: DRUPAL-5--2
Changes since 1.55.2.2: +4 -2 lines
Diff to previous 1.55.2.2 , to branch point 1.55 , to next main 1.72
A bunch of coder layout improvements, and set up the default profile at install time, not on demand

Revision 1.71.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 14 13:41:16 2009 UTC (8 months, 1 week ago) by dman
Branch: DRUPAL-6--1
Changes since 1.71: +59 -64 lines
Diff to previous 1.71
100 tedious coder syntax whitespace fixes

Revision 1.72 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 14 04:30:48 2009 UTC (8 months, 1 week ago) by dman
Branch: MAIN
CVS Tags: HEAD
Changes since 1.71: +13 -5 lines
Diff to previous 1.71
Trying to move everything into a fresh branch, tagged 6--1

Revision 1.55.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 14 03:18:50 2009 UTC (8 months, 1 week ago) by dman
Branch: DRUPAL-5--2
Changes since 1.55.2.1: +10 -5 lines
Diff to previous 1.55.2.1 , to branch point 1.55
Almost stable after major file refactoring. Marginal tests succeed again

Revision 1.55.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 14 00:26:41 2009 UTC (8 months, 1 week ago) by dman
Branch: DRUPAL-5--2
Changes since 1.55: +275 -2614 lines
Diff to previous 1.55
Major re-arrange ov directories
Very likely unstable DO NO USE

Revision 1.71 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 17 13:53:23 2008 UTC (11 months, 1 week ago) by dman
Branch: MAIN
Branch point for: DRUPAL-6--1
Changes since 1.70: +1 -6 lines
Diff to previous 1.70
TIDY UP

Revision 1.70 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Dec 11 06:33:42 2008 UTC (11 months, 2 weeks ago) by dman
Branch: MAIN
Changes since 1.69: +11 -3 lines
Diff to previous 1.69
Stopped it creating more than one Unfiltered filter at a time

Revision 1.69 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 10 05:52:43 2008 UTC (11 months, 2 weeks ago) by dman
Branch: MAIN
Changes since 1.68: +34 -11 lines
Diff to previous 1.68
Updated docs
Revised taxonomy imports
tuned the generic template to cover more test cases

Revision 1.68 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Dec 9 14:19:50 2008 UTC (11 months, 2 weeks ago) by dman
Branch: MAIN
Changes since 1.67: +80 -1085 lines
Diff to previous 1.67
This is going good.
OK, lots of tweaks. Adjusted the debug again. Can be set in the advanced prefs on a per-instance basis.
Can be called out of context really well now.
Changed default document handing to allow multiple values.
Can toggle whether to keep debug partial files.

Revision 1.67 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Dec 5 07:00:29 2008 UTC (11 months, 3 weeks ago) by dman
Branch: MAIN
Changes since 1.66: +20 -2 lines
Diff to previous 1.66
Split contrib callbacks further back
into their own inc

Revision 1.66 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Dec 4 13:59:43 2008 UTC (11 months, 3 weeks ago) by dman
Branch: MAIN
Changes since 1.65: +13 -9 lines
Diff to previous 1.65
Needed a change to the XSL site_root param that resolves what happens when an imported href starts with /
:-{  ... needs more thinking if we are to import subfolder from location A to sobfolder on location B.

But otherwise pretty sweet

Revision 1.65 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Dec 4 13:07:35 2008 UTC (11 months, 3 weeks ago) by dman
Branch: MAIN
Changes since 1.64: +100 -32 lines
Diff to previous 1.64
Fixed up the demo screen a lot
I think I FINALLY cracked the character encoding problem!

Revision 1.64 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 3 11:45:45 2008 UTC (11 months, 3 weeks ago) by dman
Branch: MAIN
Changes since 1.63: +18 -25 lines
Diff to previous 1.63
Added some robustness. Removed some debug

Revision 1.63 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 3 11:33:18 2008 UTC (11 months, 3 weeks ago) by dman
Branch: MAIN
Changes since 1.62: +1355 -1355 lines
Diff to previous 1.62
Huge file-ending problem fix up.
I think my Mac touched them and saved them :(
Back to Unix newlines please

Revision 1.62 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 01:52:06 2008 UTC (15 months, 1 week ago) by dman
Branch: MAIN
Changes since 1.61: +5 -5 lines
Diff to previous 1.61
Abstracted the form builder a bit more for external modules to re-use (wrapper.module)

Revision 1.61 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jul 22 05:30:45 2008 UTC (16 months ago) by dman
Branch: MAIN
Changes since 1.60: +14 -17 lines
Diff to previous 1.60
small work to integrate with wrapper.module.
MAY HAVE BROKEN the rewrite process as I'm removing 'relative' relinking options totally

Revision 1.60 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 20 17:17:26 2008 UTC (16 months ago) by dman
Branch: MAIN
Changes since 1.59: +26 -69 lines
Diff to previous 1.59
Working some more module-abstaction of semantics in.
Adding ways for other modules to usefully re-use some routines. (wrapper.module in progress)

Revision 1.59 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jul 18 07:03:45 2008 UTC (16 months, 1 week ago) by dman
Branch: MAIN
Changes since 1.58: +2 -2 lines
Diff to previous 1.58
added an XSL for more testing.
Working towards encoding further import params into a template
Some progress on making CCK fields work again.

Revision 1.58 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jul 17 06:25:11 2008 UTC (16 months, 1 week ago) by dman
Branch: MAIN
Changes since 1.57: +15 -28 lines
Diff to previous 1.57
Text translation additions.
Fix for UTF8

Revision 1.57 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 16 03:25:52 2008 UTC (16 months, 1 week ago) by dman
Branch: MAIN
Changes since 1.56: +190 -193 lines
Diff to previous 1.56
A thousand code standards changes. Long overdue
Some slightly better t() support. still only 70% complete, I modify the messages as I see them.

Revision 1.56 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jul 15 09:08:39 2008 UTC (16 months, 1 week ago) by dman
Branch: MAIN
Changes since 1.55: +1417 -2801 lines
Diff to previous 1.55
HUGE rewrite. UNSTABLE
remade tree selector form into FAPI callbacks!
split some data extractions into a library
Split the UI into a library
Rewrote the js to be jquery

Revision 1.55 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jun 27 19:46:27 2008 UTC (16 months, 4 weeks ago) by dman
Branch: MAIN
Branch point for: DRUPAL-5--2
Changes since 1.54: +1343 -870 lines
Diff to previous 1.54
Merging DRUPAL-5--1 back into HEAD
I hope I'm doing this right

Revision 1.54 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Feb 13 19:47:16 2008 UTC (21 months, 1 week ago) by ax
Branch: MAIN
Changes since 1.53: +9 -4 lines
Diff to previous 1.53
Doxygen comments: don't use @mainpage (this is reserved for an index page for *all* contrib modules), but @defgroup/@ingroup grouping. and don't use @package: this is reserved for java packages [1].

[1] http://www.stack.nl/~dimitri/doxygen/commands.html#cmdpackage

Revision 1.51.2.21 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Feb 1 05:32:30 2008 UTC (21 months, 3 weeks ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-4
Changes since 1.51.2.20: +8 -4 lines
Diff to previous 1.51.2.20 , to branch point 1.51 , to next main 1.72
Adjustment to the xsl filepath scan pattern - xsl can be in the modules directory or the
files directory

Revision 1.51.2.20 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Nov 23 05:47:32 2007 UTC (2 years ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.19: +41 -39 lines
Diff to previous 1.51.2.19 , to branch point 1.51
consistant quoting - changing double qoutes to singles where
appropriate.
Just syntax really, in prep for import profile instances

Revision 1.51.2.19 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Nov 9 13:35:50 2007 UTC (2 years ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.18: +41 -101 lines
Diff to previous 1.51.2.18 , to branch point 1.51
Moved around some of the tidy library
Shifted the admin pages under admin/build instead of the old admin level
Some syntax chacks
documentation review

Revision 1.51.2.18 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Oct 5 01:50:23 2007 UTC (2 years, 1 month ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-3
Changes since 1.51.2.17: +2 -2 lines
Diff to previous 1.51.2.17 , to branch point 1.51
Ooops. Left debug flag on again. I always do that.

Revision 1.51.2.17 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Oct 5 01:43:00 2007 UTC (2 years, 1 month ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.16: +136 -71 lines
Diff to previous 1.51.2.16 , to branch point 1.51
MAY BE UNSTABLE

Modifications to support semantic round-tripping of CCK fields - for
static.module

Changes to the link-rewriting logic for better linking to imported
files. Root-relative links are now rewritten also, they weren't
before. There's now the option to choose between true-relative and
root-relative links.

Tricky changes may have side-effects in other test cases.

Revision 1.51.2.16 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Oct 3 23:52:08 2007 UTC (2 years, 1 month ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.15: +16 -2 lines
Diff to previous 1.51.2.15 , to branch point 1.51
Exposed the import_html_rewrite_links option, and explained its behavioour a bit more, following issue
http://drupal.org/node/180573

Also typo as noted in http://drupal.org/node/120263

Revision 1.51.2.15 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 3 16:38:59 2007 UTC (2 years, 3 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.14: +310 -366 lines
Diff to previous 1.51.2.14 , to branch point 1.51
A thousand code style changes. These files probably will not be compatable with any previous version ... but it's all just whtespace changes!

Anyway, I froze a 'before' version as DRUPAL-5-3-dev, use that if this is broken.
So far mostly untested :(

Revision 1.51.2.14 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jul 9 01:54:15 2007 UTC (2 years, 4 months ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-3-dev
Changes since 1.51.2.13: +48 -5 lines
Diff to previous 1.51.2.13 , to branch point 1.51
Tweak for NBSP problem with commandline tidy;

Revision 1.51.2.13 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 17 01:55:41 2007 UTC (2 years, 6 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.12: +44 -39 lines
Diff to previous 1.51.2.12 , to branch point 1.51
Updated UI to allow manual over-ride of HTMLTidy Path, even if it was found OK.

Revision 1.51.2.12 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 17 01:42:40 2007 UTC (2 years, 6 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.11: +6 -7 lines
Diff to previous 1.51.2.11 , to branch point 1.51
Slightly better detection of the htmltidy path
Handle the case where the file is found, but it's not runnable
http://drupal.org/node/144604

Revision 1.51.2.11 - (view) (download) (as text) (annotate) - [select for diffs]
Wed May 2 23:22:11 2007 UTC (2 years, 6 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.10: +34 -7 lines
Diff to previous 1.51.2.10 , to branch point 1.51
Better handling of CCK import arrays.
Support for nodewords/keywords
An attempt at handling CCK image (incomplete)

Revision 1.51.2.10 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 1 08:38:51 2007 UTC (2 years, 6 months ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-2
Changes since 1.51.2.9: +2 -2 lines
Diff to previous 1.51.2.9 , to branch point 1.51
subsection input ignored due to typo in code

http://drupal.org/node/140392

Revision 1.51.2.9 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 24 15:32:43 2007 UTC (2 years, 7 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.8: +8 -7 lines
Diff to previous 1.51.2.8 , to branch point 1.51
Some robustness added - mainly for supporting multiple-node creation and to prevent errors from slightly incorrectly initialized input

Revision 1.51.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 24 13:14:56 2007 UTC (2 years, 7 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.7: +2 -2 lines
Diff to previous 1.51.2.7 , to branch point 1.51
problem with the ../ path rewrite rules
http://drupal.org/node/137162

Revision 1.51.2.7 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Apr 18 23:51:01 2007 UTC (2 years, 7 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.6: +2 -2 lines
Diff to previous 1.51.2.6 , to branch point 1.51
fix for
Object of class DOMDocument could not be converted to string
(possibly dependant on the PHP version)
http://drupal.org/node/137205

Revision 1.51.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Mar 8 10:19:25 2007 UTC (2 years, 8 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.5: +43 -25 lines
Diff to previous 1.51.2.5 , to branch point 1.51
Repaired a form redundancy in the demo. A symptom of the way $form[edit] syntax changed

Also changed the way a 'title' was detected.
If an H1 is found, use that.
If not, and a <title> is found, use that.
If not, maybe a meta name='title' or a rel='title' may have filled it in.
... fallback if all those fail is still the URL name.

Revision 1.51.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 20 12:30:40 2007 UTC (2 years, 9 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.4: +10 -5 lines
Diff to previous 1.51.2.4 , to branch point 1.51
Fix to the XSL that rewrote URLs - parameters are passed to XSL as strings, not BOOL, so '0' evaluates TRUE :(
Worked through getting the static_html add-on working as expected. Very cool.

Revision 1.51.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 20 01:44:36 2007 UTC (2 years, 9 months ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-1
Changes since 1.51.2.3: +26 -14 lines
Diff to previous 1.51.2.3 , to branch point 1.51
Bugfixes from
http://drupal.org/node/120263#comment-199941

Revision 1.51.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Feb 19 13:50:26 2007 UTC (2 years, 9 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51.2.2: +94 -132 lines
Diff to previous 1.51.2.2 , to branch point 1.51
Added a feature where all table tags can be stripped during import (do not use this if you actually use data tables)
Added the ability to turn OFF the filename rewriting that was correcting spaces into underscores in URLs.

Repaired the menu-building which got a little lost during update.
import_html_add_node_navigation() now calls  menu_edit_item_save() explicitly instead of trusting node_save() to do so.

Patched the admin-user-only permissions problem. the new access right 'access import html' should allow any privileged user to to it.

Revision 1.51.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 12:00:54 2007 UTC (2 years, 9 months ago) by dman
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-0
Changes since 1.51.2.1: +2 -3 lines
Diff to previous 1.51.2.1 , to branch point 1.51
Removed leftover debug

Revision 1.51.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 11:53:03 2007 UTC (2 years, 9 months ago) by dman
Branch: DRUPAL-5
Changes since 1.51: +973 -535 lines
Diff to previous 1.51
retagging, re-branching
Hopefully th 5.0 is in the right place now

Revision 1.53 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 11:51:28 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
CVS Tags: DRUPAL-4-7--2-0
Changes since 1.52: +534 -972 lines
Diff to previous 1.52
Incorrectly committed the 5.0 versio to the main 4.7 branch

Revision 1.52 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 11:44:02 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.51: +985 -547 lines
Diff to previous 1.51
retagging, re-branching

Revision 1.34.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 04:41:37 2007 UTC (2 years, 9 months ago) by dman
Changes since 1.34.2.1: +16 -16 lines
Diff to previous 1.34.2.1 , to branch point 1.34 , to next main 1.72
Drupal 5.0 branch seems to work. Now to find how to merge the last few months changes back in again :(

Revision 1.34.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 04:18:48 2007 UTC (2 years, 9 months ago) by dman
Changes since 1.34: +1006 -1121 lines
Diff to previous 1.34
Starting 5.0 branch incorporating updates from larrychu
http://drupal.org/node/111740
untested, and applying to a 4-month old release.
Testing and re-merging to do...

Revision 1.51 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 03:15:29 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
CVS Tags: DRUPAL-5--0-1
Branch point for: DRUPAL-5
Changes since 1.50: +4 -3 lines
Diff to previous 1.50
Turned off small warning regarding blank tags - following the taxonomy integration changes

Revision 1.50 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 13 01:58:01 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.49: +28 -2 lines
Diff to previous 1.49
Some work to incorporate taxonomy terms better.

This has been (still is) mostly undocumented, but if your source page has
<meta name='tag' content='widget'/>
or <a rel='tag'>widget</a>
in it, before or after the XSL transform, the page will be tagged with the taxonomy term 'widget' ... if it exists in any vocab so far.

To support free-tagging was harder. I needed to define the taxonomy as well.
<a rel='tag'>Products:widget B</a>
will tag the page with the term 'widget B' in the vocab 'Products' ... on-the-fly if free-tagging is enabled.

Revision 1.49 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Feb 12 23:46:07 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48
DOH! Debug left on

Revision 1.48 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Feb 12 23:39:56 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.47: +18 -4 lines
Diff to previous 1.47
Added support for import username selection (not heavily tested yet)
Removed a bug re CCK imports

Revision 1.47 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Feb 3 15:01:18 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.46: +7 -3 lines
Diff to previous 1.46
brackets in the wrong place - from testing of last sumbit for merging metadata

Revision 1.46 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Feb 3 05:26:32 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.45: +40 -41 lines
Diff to previous 1.45
re-impoting over already imported pages MERGES pre-existing metadata and taxonomy terms
renamed the classes on the tre-view to avoid conflict with some themes - class=page becomes class=page-item so global settings for 'pgae' do not get applied
added a MAX_TITLE_LENGTH config option in case the default (24 characters) wasn't long enough.

Revision 1.45 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 30 10:11:36 2007 UTC (2 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.44: +32 -8 lines
Diff to previous 1.44
Allowed the min menu title length to be configurable .

Revision 1.44 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jan 25 01:43:00 2007 UTC (2 years, 10 months ago) by dman
Branch: MAIN
Changes since 1.43: +2 -3 lines
Diff to previous 1.43
Another patch for php 4. XPath returns a nodeset object, not an array of nodes.

Revision 1.43 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Dec 16 01:15:55 2006 UTC (2 years, 11 months ago) by dman
Branch: MAIN
Changes since 1.42: +13 -1 lines
Diff to previous 1.42
Updated docs in reference to known issues

Import_html confused about file:/// paths when using realpath()
http://drupal.org/node/103221

import converts &lt; to < and &gt; to >
http://drupal.org/node/97532

Revision 1.42 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 13 13:32:27 2006 UTC (2 years, 11 months ago) by dman
Branch: MAIN
Changes since 1.41: +2244 -2210 lines
Diff to previous 1.41
Updated support for CCK.
Input can either be id="byline" or id="field_byline" to populate a CCK 'byline' field.

Also support for HTML/non-HTML input text areas

Revision 1.41 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Dec 3 11:18:59 2006 UTC (2 years, 11 months ago) by dman
Branch: MAIN
Changes since 1.40: +2209 -2177 lines
Diff to previous 1.40
Started supporting CCK
If your input contains ANY classes at all, the content of those classes
becomes available for absorbing into the node.
If the input contains any ID elements, those too are added to the node
object before saving.
most of these extra blocks do not get serialized, as there is no handler
for them
BUT

If you are importing to CCK, AND can manipulate your input so as to
define ids of the form field_* - this block will be put in that cck
field.

So...
if your input contains
...
[div id='footer'][b]blah[/b][/div]
...
and yo have a CCK node definition that includes a field called 'footer'
- you need to work on your XSL import massager to make a conversion to
[div id='field_footer'][b]blah[/b][/div]

Once that is, done, the import_html process can detect that this is a
ver special ID in the source document, and inject it into the CCK object
as
$node->field_footer[0][value] = "[b]blah[/b]";

and things become good

Revision 1.40 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Nov 20 13:22:18 2006 UTC (3 years ago) by dman
Branch: MAIN
Changes since 1.39: +3 -2 lines
Diff to previous 1.39
fixed error with deducing suffix
http://drupal.org/node/97835

Revision 1.39 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Nov 20 13:17:39 2006 UTC (3 years ago) by dman
Branch: MAIN
Changes since 1.38: +2176 -2176 lines
Diff to previous 1.38
typo/info on demo page
http://drupal.org/node/97750

Revision 1.38 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Nov 12 06:41:07 2006 UTC (3 years ago) by dman
Branch: MAIN
Changes since 1.37: +227 -221 lines
Diff to previous 1.37
Fixed page type selector (it didn't work)
Fixed 'do NOT add to menu' checkbox
Repositioned settings summary
Moved some of the options from final import stage back to settings and
step 1. The final form was getting cluttered.

Revision 1.37 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Oct 26 14:33:05 2006 UTC (3 years, 1 month ago) by dman
Branch: MAIN
Changes since 1.36: +10 -4 lines
Diff to previous 1.36
2 error message hanling fixes for 4.7
Nasty invalid code was giving nasty messages (log length limit didn't render the closing [pre])
4.7 doesn't allow me to clear form_set_errors any more. it was halting all further processing when one page
failed.

Revision 1.36 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Oct 26 11:36:39 2006 UTC (3 years, 1 month ago) by dman
Branch: MAIN
Changes since 1.35: +2164 -2164 lines
Diff to previous 1.35
All up-to-date?:

Revision 1.35 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Oct 13 14:34:50 2006 UTC (3 years, 1 month ago) by dman
Branch: MAIN
Changes since 1.34: +98 -49 lines
Diff to previous 1.34
Patched in taxonomy support from L0rne
http://drupal.org/node/46775

Also reviewed the docs, and fixed a problem with the hidden files regexps.
Changed the auto-teaser to be safe HTML when importing, as some older-formatted sites (tables) broke things frequently.

Revision 1.23.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Oct 8 14:44:20 2006 UTC (3 years, 1 month ago) by dman
Branch: DRUPAL-4-7
Changes since 1.23: +4 -3 lines
Diff to previous 1.23 , to next main 1.72
Updated the docs slightly. Made debug work again (looked like it was broken last commit)

Revision 1.34 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Sep 14 01:34:41 2006 UTC (3 years, 2 months ago) by dman
Branch: MAIN
Changes since 1.33: +31 -53 lines
Diff to previous 1.33
A dozen annoying little tweaks to fine-tune the php4 problems.
Got htmltidy for it working again. Added error message capture and display
Reviewed the xml toString function.
Had to give up on getting PHP4 to include XSL sub-templates. Still dunno why it refuses.
Tuned the behaviours on first install a little

Revision 1.33 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 25 15:43:33 2006 UTC (3 years, 3 months ago) by dman
Branch: MAIN
Changes since 1.32: +15 -8 lines
Diff to previous 1.32
consistancy checks. tidy extension was mis-identifying itself in PHP4.
Several library updates

Revision 1.32 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 25 14:43:20 2006 UTC (3 years, 3 months ago) by dman
Branch: MAIN
Changes since 1.31: +112 -59 lines
Diff to previous 1.31
Some testing with PHP4 XSL (gah!) and a tidy-up of the prototype 'static' module - soon to be split into its own world

Revision 1.31 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jul 11 13:29:50 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.30: +3 -1 lines
Diff to previous 1.30
Killed the random xmlns: problem ... touchwood

Revision 1.30 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jul 10 16:23:00 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.29: +152 -74 lines
Diff to previous 1.29
Added option to disable URL rewrites altogether.
Fixed demo page to work with URLs again (it'd stopped)
Tracked some minor XML/Tidy parsing inconsistancies.
Even more verbose comments and explanations on admin pages

Revision 1.29 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 5 09:22:44 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.28: +97 -27 lines
Diff to previous 1.28
Adjusted so the URL-rewriting (no base) works again.
relative hrefs are left alone, resource srcs are found over under /files.

Also tried to sort out the escaping of script elements, CDATA and output escaping under XML. Added a config option to strip them totally.

Added regexp filter option to allow user to show/hide the hidden files in the file list.
Couple of cosmetics, help wording and code format

Revision 1.28 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jul 4 16:46:47 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.27: +2 -2 lines
Diff to previous 1.27
Looks like there are troubles with the URL rewrites.
Now Drupal has got rid of the BASE problem, I need to change the logic of the rewriter.
Not done yet

Revision 1.27 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jul 4 16:39:06 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.26: +274 -365 lines
Diff to previous 1.26
Seems the menu builder had stopped working entirely in 4.7
Spent a few hours fighting with menu.inc trying to get it to co-operate with path.inc without the caching getting in the way.
Tried using the new menu_get_item call, but it does NOT lookup paths correctly - ont 'normal' node/n paths. Bastard.

Hopefully the menu building is better.

Revision 1.26 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jul 3 14:55:14 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.25: +533 -418 lines
Diff to previous 1.25
Re-worked the internals severly.
Now reads from pure XHTML + microformats instead of the old import-XML sources.
Added support for MULTIPLE documents from one source file - exactly how it works will need some docs and examples.
This made the code pretty scary inside.

Added more XML support to the library.
Document parsing now absorbs meta tags, link tags, and pretty much every class tag it can find.
Still need to do something about it for serializing however.

This version may be flaky. I'd advise sticking with the previous one until it's tested.

Revision 1.25 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 2 22:19:13 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.24: +6 -6 lines
Diff to previous 1.24
About to change the underlying XML format (old import/XML was crap) to portable XHTML instead of made-up tags.
May be unstable for a round or two

Revision 1.24 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jun 30 02:29:45 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Changes since 1.23: +11 -7 lines
Diff to previous 1.23
Replaced the debug function call that was .. removed during debugging.
Also modified the path replication to handle spaces in filenames (bad, but legacy)

Revision 1.23 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jun 29 05:59:17 2006 UTC (3 years, 4 months ago) by dman
Branch: MAIN
Branch point for: DRUPAL-4-7
Changes since 1.22: +36 -15 lines
Diff to previous 1.22
Revised many bits to test on PHP5 with Tidy extension installed.
PHP5 XML, commandline tidy was fine, but no testing had been done on the two extensions together.
Updated to use PHP5 XML/XSL methods correctly.
Namespaces and XMLbase were both severely different 4->5

Revision 1.22 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jun 27 21:54:10 2006 UTC (3 years, 5 months ago) by dman
Branch: MAIN
Changes since 1.21: +60 -37 lines
Diff to previous 1.21
Ensure everything is up to date

Revision 1.21 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jun 17 21:47:04 2006 UTC (3 years, 5 months ago) by dman
Branch: MAIN
Changes since 1.20: +1156 -789 lines
Diff to previous 1.20
Got it all going in 4.7! Needs testing as I've found a few hidden dangers in the 4.7 changes (like alias caching) but the API bits should be fitting together again

Revision 1.20 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 3 13:34:41 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.19: +56 -20 lines
Diff to previous 1.19
Added the ability to select a manu for navigation tree to be hung off.
Verified the settings a little more (ensured trailing slash on subsections)
UI tweak for the file list.
Tidied some of the form stuff for conversion to 4.7

Revision 1.19 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 3 05:24:21 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.18: +182 -182 lines
Diff to previous 1.18
Legacy file containing php markup kill the XML parser. Added a filter to discard php code. Shold probably make it optional or escape it somehow to protect

Revision 1.18 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 31 14:10:24 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17
Turn off debug :-B

Revision 1.17 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 31 13:23:02 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.16: +32 -2 lines
Diff to previous 1.16
Added an option to rewrite all source href links to friendly URLS (no suffix) during import.
This is distinct from renaming the URLs themselves.

Can now provide a smooth transition from /old/section/index.html links into just 'new/section' syntax, across the board.

Revision 1.16 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 31 11:58:46 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.15: +23 -8 lines
Diff to previous 1.15
Fixed a path calculation that was returning bogus slashes in URLs folder/name///url.htm
Mostly harmless, but messy

dirname('/ok.htm') returns '\'; No idea why, may only happen at root level on Win

Revision 1.15 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 31 10:57:05 2006 UTC (3 years, 7 months ago) by dman
Branch: MAIN
Changes since 1.14: +4 -4 lines
Diff to previous 1.14
Corrected the options settings checkboxes - the default value and the actual value were swapped in the code -

Revision 1.14 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Feb 23 05:48:09 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13
Whoops, forgot to turn off debug

Revision 1.13 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Feb 22 20:34:18 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.12: +10 -3 lines
Diff to previous 1.12
Modified to support (semi) query strings in import URLS. it hashes them to ugly filenames, just so I can save the remote document as a local file safely.

Revision 1.12 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Feb 3 03:41:18 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11
Added subdir to explanatory text to avoid confusion.

Revision 1.11 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 31 11:12:30 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.10: +3 -2 lines
Diff to previous 1.10
FIXED:
the / at the end of the path. When I put one in, I end up with two.

Revision 1.10 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 31 01:52:23 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.9: +118 -49 lines
Diff to previous 1.9
Created options for selecting what happens if:
- page already exists (merge or skip)
- no title found on page (skip, guess or placeholder)

Revision 1.9 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jan 29 05:33:10 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.8: +13 -5 lines
Diff to previous 1.8
More carefulness and user settings. Allow admin to define the htmltidy path

Revision 1.8 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jan 29 05:10:38 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.7: +25 -7 lines
Diff to previous 1.7
Added lots of checks for the availablilty of the HTMLTidy executable, including an auto-installer.

Revision 1.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jan 28 01:00:04 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.6: +33 -21 lines
Diff to previous 1.6
Fixed checkboxes for firefox.
Seems moz doesn't lrt me access dom stuff like checkbox.getAttribute('checked') - only checkbox.checked - although it should be an exposed attribute! the DHTML .checked is an internal value only, why can't I get at it via dom?

Revision 1.6 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jan 27 23:47:44 2006 UTC (3 years, 9 months ago) by dman
Branch: MAIN
Changes since 1.5: +15 -6 lines
Diff to previous 1.5
Can now disable menu automatic creation.
Checks that path.module and menu.module are available before using them.

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 24 04:08:39 2006 UTC (3 years, 10 months ago) by dman
Branch: MAIN
Changes since 1.4: +89 -84 lines
Diff to previous 1.4
Applied coding conventions consistantly. Added partial disclaimer

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 23 11:37:21 2006 UTC (3 years, 10 months ago) by dman
Branch: MAIN
Branch point for: DRUPAL-4-6
Changes since 1.3: +7 -1 lines
Diff to previous 1.3
Better checking for XML dependancies

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 23 11:07:35 2006 UTC (3 years, 10 months ago) by dman
Branch: MAIN
Changes since 1.2: +7 -7 lines
Diff to previous 1.2
Changed debug warnings to php trigger_error messages

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 23 10:38:41 2006 UTC (3 years, 10 months ago) by dman
Branch: MAIN
Changes since 1.1: +2 -1 lines
Diff to previous 1.1
Chasing dependancies - the file routines

Revision 1.1 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 23 09:31:10 2006 UTC (3 years, 10 months ago) by dman
Branch: MAIN
OK, Here's the files.
I'll commit them, then try installing to a brand new setup and see what happens. I'm sure there will be a library or two missing.

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.2