Commit ce75b4c
committed
Fix two-stage processing when flat node file is used
This is an additional fix to the fix in 8d1a55e. If a flat node file is
used, nodes are not stored in the database (unless --middle-with-nodes
is specified, but also then only nodes with tags are stored in the
database).
There are two problems here:
1. The "get_node" prepared statement was not prepared in this case,
so it fails when executes. This is fixed by only executing that
statement if m_store_options.nodes is set in the middle.
2. If there is no node in the database, there might still be one
in the flat node file. So we need to try this and create the
node from the information in there. (It will only have the node
id and location in it, but at least we get the location.)
This commit contains both fixes.1 parent f872d39 commit ce75b4c
1 file changed
+22
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
762 | 762 | | |
763 | 763 | | |
764 | 764 | | |
765 | | - | |
| 765 | + | |
| 766 | + | |
766 | 767 | | |
767 | | - | |
768 | | - | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
769 | 773 | | |
770 | 774 | | |
771 | | - | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
772 | 780 | | |
773 | | - | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
774 | 786 | | |
775 | | - | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
776 | 792 | | |
777 | 793 | | |
778 | 794 | | |
| |||
0 commit comments